diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
| commit | 4a1032faac94ebbf647460ae3e06fc21146eb280 (patch) | |
| tree | 7f31b97beb0406faa1523e619289ad0ab07c9787 /drivers/watchdog/pika_wdt.c | |
| parent | ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06 (diff) | |
| parent | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/watchdog/pika_wdt.c')
| -rw-r--r-- | drivers/watchdog/pika_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/pika_wdt.c b/drivers/watchdog/pika_wdt.c index 435ec2aed4fe..2d22e996e996 100644 --- a/drivers/watchdog/pika_wdt.c +++ b/drivers/watchdog/pika_wdt.c | |||
| @@ -52,7 +52,7 @@ static struct { | |||
| 52 | struct timer_list timer; /* The timer that pings the watchdog */ | 52 | struct timer_list timer; /* The timer that pings the watchdog */ |
| 53 | } pikawdt_private; | 53 | } pikawdt_private; |
| 54 | 54 | ||
| 55 | static const struct watchdog_info ident = { | 55 | static struct watchdog_info ident = { |
| 56 | .identity = DRV_NAME, | 56 | .identity = DRV_NAME, |
| 57 | .options = WDIOF_CARDRESET | | 57 | .options = WDIOF_CARDRESET | |
| 58 | WDIOF_SETTIMEOUT | | 58 | WDIOF_SETTIMEOUT | |