diff options
author | Jean Cyr <jcyr@dillobits.com> | 2013-07-07 14:29:30 -0400 |
---|---|---|
committer | Jean Cyr <jcyr@dillobits.com> | 2013-07-07 14:29:30 -0400 |
commit | 35711280df491c27ea42bd93d8102168a8514896 (patch) | |
tree | 71c5b995f1702d24db6f4e0ad242c138b286ac08 /src/modules/px4iofirmware | |
parent | 7a6a786708814c3ddfa2973189a7334144e4e741 (diff) | |
parent | cf2dbdf9a1ae06c7d0e0a7963916a3709a1bc075 (diff) | |
download | px4-firmware-35711280df491c27ea42bd93d8102168a8514896.tar.gz px4-firmware-35711280df491c27ea42bd93d8102168a8514896.tar.bz2 px4-firmware-35711280df491c27ea42bd93d8102168a8514896.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/modules/px4iofirmware')
-rw-r--r-- | src/modules/px4iofirmware/adc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/px4iofirmware/adc.c b/src/modules/px4iofirmware/adc.c index f744698be..81566eb2a 100644 --- a/src/modules/px4iofirmware/adc.c +++ b/src/modules/px4iofirmware/adc.c @@ -41,7 +41,7 @@ #include <nuttx/arch.h> #include <arch/stm32/chip.h> -#include <stm32_internal.h> +#include <stm32.h> #include <drivers/drv_hrt.h> #include <systemlib/perf_counter.h> |