aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2011-07-22 19:20:13 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-08-08 14:29:31 -0400
commita656ffcbc7a98a80d2136ae6bbdd8ae2eb48c78a (patch)
tree9b732b9a15ad8cc9c8790f36f3ac9a00bf6972c2 /drivers/watchdog
parent08ccf57283f89adbc2ff897ad82d6ad4560db7cd (diff)
bcm47xx: make it possible to build bcm47xx without ssb.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Acked-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/bcm47xx_wdt.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/watchdog/bcm47xx_wdt.c b/drivers/watchdog/bcm47xx_wdt.c
index c43406c48613..6b037024464f 100644
--- a/drivers/watchdog/bcm47xx_wdt.c
+++ b/drivers/watchdog/bcm47xx_wdt.c
@@ -55,17 +55,21 @@ static inline void bcm47xx_wdt_hw_start(void)
55{ 55{
56 /* this is 2,5s on 100Mhz clock and 2s on 133 Mhz */ 56 /* this is 2,5s on 100Mhz clock and 2s on 133 Mhz */
57 switch (bcm47xx_bus_type) { 57 switch (bcm47xx_bus_type) {
58#ifdef CONFIG_BCM47XX_SSB
58 case BCM47XX_BUS_TYPE_SSB: 59 case BCM47XX_BUS_TYPE_SSB:
59 ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 0xfffffff); 60 ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 0xfffffff);
60 break; 61 break;
62#endif
61 } 63 }
62} 64}
63 65
64static inline int bcm47xx_wdt_hw_stop(void) 66static inline int bcm47xx_wdt_hw_stop(void)
65{ 67{
66 switch (bcm47xx_bus_type) { 68 switch (bcm47xx_bus_type) {
69#ifdef CONFIG_BCM47XX_SSB
67 case BCM47XX_BUS_TYPE_SSB: 70 case BCM47XX_BUS_TYPE_SSB:
68 return ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 0); 71 return ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 0);
72#endif
69 } 73 }
70 return -EINVAL; 74 return -EINVAL;
71} 75}