diff options
author | px4dev <px4@purgatory.org> | 2013-07-07 17:53:55 -0700 |
---|---|---|
committer | px4dev <px4@purgatory.org> | 2013-07-07 17:53:55 -0700 |
commit | b4029dd824cec7a0b53c62e960f80d90ddc6e13c (patch) | |
tree | 2bae71f23af17bb0d9de26a914c859ec9af1e010 /src/drivers/stm32/tone_alarm | |
parent | 43f1843cc750fcef07122feaeca07863ed28c036 (diff) | |
download | px4-firmware-b4029dd824cec7a0b53c62e960f80d90ddc6e13c.tar.gz px4-firmware-b4029dd824cec7a0b53c62e960f80d90ddc6e13c.tar.bz2 px4-firmware-b4029dd824cec7a0b53c62e960f80d90ddc6e13c.zip |
Pull v2 pieces up to build with the merge
Diffstat (limited to 'src/drivers/stm32/tone_alarm')
-rw-r--r-- | src/drivers/stm32/tone_alarm/tone_alarm.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/drivers/stm32/tone_alarm/tone_alarm.cpp b/src/drivers/stm32/tone_alarm/tone_alarm.cpp index 167ef30a8..2284be84d 100644 --- a/src/drivers/stm32/tone_alarm/tone_alarm.cpp +++ b/src/drivers/stm32/tone_alarm/tone_alarm.cpp @@ -117,10 +117,6 @@ #include <systemlib/err.h> -#ifndef CONFIG_HRT_TIMER -# error This driver requires CONFIG_HRT_TIMER -#endif - /* Tone alarm configuration */ #if TONE_ALARM_TIMER == 2 # define TONE_ALARM_BASE STM32_TIM2_BASE |