diff options
author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
---|---|---|
committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/watchdog/wdt_pci.c | |
parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/watchdog/wdt_pci.c')
-rw-r--r-- | drivers/watchdog/wdt_pci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c index 6130c88fa5ac..172dad6c7693 100644 --- a/drivers/watchdog/wdt_pci.c +++ b/drivers/watchdog/wdt_pci.c | |||
@@ -31,7 +31,7 @@ | |||
31 | * Jeff Garzik : PCI cleanups | 31 | * Jeff Garzik : PCI cleanups |
32 | * Tigran Aivazian : Restructured wdtpci_init_one() to handle | 32 | * Tigran Aivazian : Restructured wdtpci_init_one() to handle |
33 | * failures | 33 | * failures |
34 | * Joel Becker : Added WDIOC_GET/SETTIMEOUT | 34 | * Joel Becker : Added WDIOC_GET/SETTIMEOUT |
35 | * Zwane Mwaikambo : Magic char closing, locking changes, | 35 | * Zwane Mwaikambo : Magic char closing, locking changes, |
36 | * cleanups | 36 | * cleanups |
37 | * Matt Domsch : nowayout module option | 37 | * Matt Domsch : nowayout module option |
@@ -727,7 +727,7 @@ static void __devexit wdtpci_remove_one(struct pci_dev *pdev) | |||
727 | } | 727 | } |
728 | 728 | ||
729 | 729 | ||
730 | static struct pci_device_id wdtpci_pci_tbl[] = { | 730 | static DEFINE_PCI_DEVICE_TABLE(wdtpci_pci_tbl) = { |
731 | { | 731 | { |
732 | .vendor = PCI_VENDOR_ID_ACCESSIO, | 732 | .vendor = PCI_VENDOR_ID_ACCESSIO, |
733 | .device = PCI_DEVICE_ID_ACCESSIO_WDG_CSM, | 733 | .device = PCI_DEVICE_ID_ACCESSIO_WDG_CSM, |
@@ -764,7 +764,7 @@ static void __exit wdtpci_cleanup(void) | |||
764 | 764 | ||
765 | 765 | ||
766 | /** | 766 | /** |
767 | * wdtpci_init: | 767 | * wdtpci_init: |
768 | * | 768 | * |
769 | * Set up the WDT watchdog board. All we have to do is grab the | 769 | * Set up the WDT watchdog board. All we have to do is grab the |
770 | * resources we require and bitch if anyone beat us to them. | 770 | * resources we require and bitch if anyone beat us to them. |