Merge tag 'for-linville-20130318' of git://github.com/kvalo/ath6kl

[karo-tx-linux.git] / include / linux / bcm47xx_wdt.h

diff --git a/include/linux/bcm47xx_wdt.h b/include/linux/bcm47xx_wdt.h
index e5dfc256485b51844dc2d599358a61248dcbfe3b..b708786d4cbf6d374bdff697eac61e623d427723 100644 (file)
--- a/include/linux/bcm47xx_wdt.h
+++ b/include/linux/bcm47xx_wdt.h
@@ -1,7 +1,10 @@
 #ifndef LINUX_BCM47XX_WDT_H_
 #define LINUX_BCM47XX_WDT_H_
 
+#include <linux/notifier.h>
+#include <linux/timer.h>
 #include <linux/types.h>
+#include <linux/watchdog.h>
 
 
 struct bcm47xx_wdt {
@@ -10,6 +13,12 @@ struct bcm47xx_wdt {
        u32 max_timer_ms;
 
        void *driver_data;
+
+       struct watchdog_device wdd;
+       struct notifier_block notifier;
+
+       struct timer_list soft_timer;
+       atomic_t soft_ticks;
 };
 
 static inline void *bcm47xx_wdt_get_drvdata(struct bcm47xx_wdt *wdt)