diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-12-05 12:46:08 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-12-06 14:58:58 -0500 |
| commit | bde327eff8a722df1198df9b14464f84f1adfb65 (patch) | |
| tree | dde6282acfa1957a4fa310540a9206aeba277d57 /include/linux/ssb | |
| parent | 9f640a6376e54fa9ae834c32cbe92cefeec970dc (diff) | |
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/linux/ssb')
| -rw-r--r-- | include/linux/ssb/ssb.h | 2 |
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 @@ | |||
| 8 | #include <linux/pci.h> | 8 | #include <linux/pci.h> |
| 9 | #include <linux/mod_devicetable.h> | 9 | #include <linux/mod_devicetable.h> |
| 10 | #include <linux/dma-mapping.h> | 10 | #include <linux/dma-mapping.h> |
| 11 | #include <linux/platform_device.h> | ||
| 11 | 12 | ||
| 12 | #include <linux/ssb/ssb_regs.h> | 13 | #include <linux/ssb/ssb_regs.h> |
| 13 | 14 | ||
| @@ -432,6 +433,7 @@ struct ssb_bus { | |||
| 432 | #ifdef CONFIG_SSB_EMBEDDED | 433 | #ifdef CONFIG_SSB_EMBEDDED |
| 433 | /* Lock for GPIO register access. */ | 434 | /* Lock for GPIO register access. */ |
| 434 | spinlock_t gpio_lock; | 435 | spinlock_t gpio_lock; |
| 436 | struct platform_device *watchdog; | ||
| 435 | #endif /* EMBEDDED */ | 437 | #endif /* EMBEDDED */ |
| 436 | 438 | ||
| 437 | /* Internal-only stuff follows. Do not touch. */ | 439 | /* Internal-only stuff follows. Do not touch. */ |
