summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2012-12-05 18:46:08 +0100
committerJohn W. Linville <linville@tuxdriver.com>2012-12-06 14:58:58 -0500
commitbde327eff8a722df1198df9b14464f84f1adfb65 (patch)
treedde6282acfa1957a4fa310540a9206aeba277d57 /include
parent9f640a6376e54fa9ae834c32cbe92cefeec970dc (diff)
downloadlinux-stable-bde327eff8a722df1198df9b14464f84f1adfb65.tar.gz
linux-stable-bde327eff8a722df1198df9b14464f84f1adfb65.tar.bz2
linux-stable-bde327eff8a722df1198df9b14464f84f1adfb65.zip
ssb: register watchdog driver
Register the watchdog driver to the system if it is a SoC. Using the watchdog on a non SoC device, like a PCI card, will make the PCI card die when the timeout expired, but starting it again is not supported by ssb. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/ssb/ssb.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h
index bb674c02f306..1f64e3f1f22b 100644
--- a/include/linux/ssb/ssb.h
+++ b/include/linux/ssb/ssb.h
@@ -8,6 +8,7 @@
#include <linux/pci.h>
#include <linux/mod_devicetable.h>
#include <linux/dma-mapping.h>
+#include <linux/platform_device.h>
#include <linux/ssb/ssb_regs.h>
@@ -432,6 +433,7 @@ struct ssb_bus {
#ifdef CONFIG_SSB_EMBEDDED
/* Lock for GPIO register access. */
spinlock_t gpio_lock;
+ struct platform_device *watchdog;
#endif /* EMBEDDED */
/* Internal-only stuff follows. Do not touch. */