aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Schodet2012-09-11 08:15:11 +0200
committerPiotr Esden-Tempski2012-09-17 17:27:50 -0700
commit7851515c5c749294e82ce20cb23c6d528fb804b5 (patch)
treec59f67be52f5a55442caace4d4884482afc4cea7
parentff83a1ae1c0764aff11d8cd50f1f0f8a27ea4757 (diff)
Fix merge error
This line was removed in commit acc276a612d4, but it has been restored in the merge 02ea612142fb.
-rw-r--r--include/libopencm3/stm32/f1/adc.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/libopencm3/stm32/f1/adc.h b/include/libopencm3/stm32/f1/adc.h
index b1396a5..116aeaa 100644
--- a/include/libopencm3/stm32/f1/adc.h
+++ b/include/libopencm3/stm32/f1/adc.h
@@ -679,7 +679,6 @@ LGPL License Terms @ref lgpl_license
BEGIN_DECLS
-/* TODO */
void adc_enable_analog_watchdog_regular(u32 adc);
void adc_disable_analog_watchdog_regular(u32 adc);
void adc_enable_analog_watchdog_injected(u32 adc);