EMTime/libopencm3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge error

Browse Source 
This line was removed in commit acc276a612, but it has been restored in the
merge 02ea612142.
This commit is contained in:
Nicolas Schodet
2012-09-11 08:15:11 +02:00
committed by Piotr Esden-Tempski
parent ff83a1ae1c
commit 7851515c5c
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/libopencm3/stm32/f1/adc.h
View File

@@ -679,7 +679,6 @@ LGPL License Terms @ref lgpl_license
BEGIN_DECLS BEGIN_DECLS
/* TODO */
void adc_enable_analog_watchdog_regular(u32 adc); void adc_enable_analog_watchdog_regular(u32 adc);
void adc_disable_analog_watchdog_regular(u32 adc); void adc_disable_analog_watchdog_regular(u32 adc);
void adc_enable_analog_watchdog_injected(u32 adc); void adc_enable_analog_watchdog_injected(u32 adc);