Misc PGM fixes.

[bertos.git] / drv / wdt.h

diff --git a/drv/wdt.h b/drv/wdt.h
index 3f356cbbcb519f03c179a0b48403f060b4e6a1f5..730fa585d84c6daf2673aadb636293ae8e33e2e4 100755 (executable)
--- a/drv/wdt.h
+++ b/drv/wdt.h
@@ -14,6 +14,12 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.4  2005/04/12 01:37:17  bernie
+ *#* Prevent warning when watchdog is disabled.
+ *#*
+ *#* Revision 1.3  2005/04/11 19:10:28  bernie
+ *#* Include top-level headers from cfg/ subdir.
+ *#*
  *#* Revision 1.2  2004/11/16 21:02:07  bernie
  *#* Make driver optional; mark AVR specific parts as such.
  *#*
@@ -24,8 +30,8 @@
 #ifndef DRV_WDT_H
 #define DRV_WDT_H
 
-#include <config.h>
-#include <compiler.h> // INLINE
+#include <cfg/config.h>
+#include <cfg/compiler.h> // INLINE
 
 /* Configury sanity check */
 #if !defined(CONFIG_WATCHDOG) || (CONFIG_WATCHDOG != 0 && CONFIG_WATCHDOG != 1)
@@ -33,11 +39,11 @@
 #endif
 
 #if CONFIG_WATCHDOG
-       #include <cpu.h>
+       #include <cfg/cpu.h>
 
        #if CPU_AVR
                #include <avr/io.h>
-               #include <macros.h> // BV()
+               #include <cfg/macros.h> // BV()
        #else
                #error unknown CPU
        #endif
@@ -71,6 +77,8 @@ INLINE void wdt_init(uint8_t timeout)
        #else
                #error unknown CPU
        #endif
+#else
+       (void)timeout;
 #endif /* CONFIG_WATCHDOG */
 }