Merge branch 'next/deletion' of git://git.linaro.org/people/arnd/arm-soc

[pandora-kernel.git] / drivers / watchdog / wdt_pci.c

diff --git a/drivers/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c
index 6130c88..172dad6 100644 (file)
--- a/drivers/watchdog/wdt_pci.c
+++ b/drivers/watchdog/wdt_pci.c
@@ -31,7 +31,7 @@
  *             Jeff Garzik     :       PCI cleanups
  *             Tigran Aivazian :       Restructured wdtpci_init_one() to handle
  *                                     failures
- *             Joel Becker     :       Added WDIOC_GET/SETTIMEOUT
+ *             Joel Becker     :       Added WDIOC_GET/SETTIMEOUT
  *             Zwane Mwaikambo :       Magic char closing, locking changes,
  *                                     cleanups
  *             Matt Domsch     :       nowayout module option
@@ -727,7 +727,7 @@ static void __devexit wdtpci_remove_one(struct pci_dev *pdev)
 }
 
 
-static struct pci_device_id wdtpci_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(wdtpci_pci_tbl) = {
        {
                .vendor    = PCI_VENDOR_ID_ACCESSIO,
                .device    = PCI_DEVICE_ID_ACCESSIO_WDG_CSM,
@@ -764,7 +764,7 @@ static void __exit wdtpci_cleanup(void)
 
 
 /**
- *     wdtpci_init:
+ *     wdtpci_init:
  *
  *     Set up the WDT watchdog board. All we have to do is grab the
  *     resources we require and bitch if anyone beat us to them.