diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-29 14:20:09 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-29 14:20:09 -0400 |
commit | d6ae0c63f09cc443aa14f8b966aa3e7b2229360b (patch) | |
tree | 13e3da32cc3c9ab5c32dde93164c7ce363e76a74 /drivers/watchdog/nv_tco.c | |
parent | 8c82840e5414259b1963da36f82b64a755fafc75 (diff) | |
parent | 7fff4beb311dfab4f18ff2cd64f78ec89296a39a (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
watchdog: softdog.c: enhancement to optionally invoke panic instead of reboot on timer expiry
watchdog: fix nv_tco section mismatch
watchdog: sp5100_tco.c: Check if firmware has set correct value in tcobase.
watchdog: Convert release_resource to release_region/release_mem_region
watchdog: s3c2410_wdt.c: Convert release_resource to release_region/release_mem_region
Diffstat (limited to 'drivers/watchdog/nv_tco.c')
-rw-r--r-- | drivers/watchdog/nv_tco.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/nv_tco.c b/drivers/watchdog/nv_tco.c index 267377a5a83e..afa78a54711e 100644 --- a/drivers/watchdog/nv_tco.c +++ b/drivers/watchdog/nv_tco.c | |||
@@ -302,7 +302,7 @@ MODULE_DEVICE_TABLE(pci, tco_pci_tbl); | |||
302 | * Init & exit routines | 302 | * Init & exit routines |
303 | */ | 303 | */ |
304 | 304 | ||
305 | static unsigned char __init nv_tco_getdevice(void) | 305 | static unsigned char __devinit nv_tco_getdevice(void) |
306 | { | 306 | { |
307 | struct pci_dev *dev = NULL; | 307 | struct pci_dev *dev = NULL; |
308 | u32 val; | 308 | u32 val; |