diff options
Diffstat (limited to 'drivers/watchdog')
-rw-r--r-- | drivers/watchdog/wdt_pci.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c index 7b22e3cdbc81..6130c88fa5ac 100644 --- a/drivers/watchdog/wdt_pci.c +++ b/drivers/watchdog/wdt_pci.c | |||
@@ -60,19 +60,6 @@ | |||
60 | 60 | ||
61 | #define PFX "wdt_pci: " | 61 | #define PFX "wdt_pci: " |
62 | 62 | ||
63 | /* | ||
64 | * Until Access I/O gets their application for a PCI vendor ID approved, | ||
65 | * I don't think that it's appropriate to move these constants into the | ||
66 | * regular pci_ids.h file. -- JPN 2000/01/18 | ||
67 | */ | ||
68 | |||
69 | #ifndef PCI_VENDOR_ID_ACCESSIO | ||
70 | #define PCI_VENDOR_ID_ACCESSIO 0x494f | ||
71 | #endif | ||
72 | #ifndef PCI_DEVICE_ID_WDG_CSM | ||
73 | #define PCI_DEVICE_ID_WDG_CSM 0x22c0 | ||
74 | #endif | ||
75 | |||
76 | /* We can only use 1 card due to the /dev/watchdog restriction */ | 63 | /* We can only use 1 card due to the /dev/watchdog restriction */ |
77 | static int dev_count; | 64 | static int dev_count; |
78 | 65 | ||
@@ -743,7 +730,7 @@ static void __devexit wdtpci_remove_one(struct pci_dev *pdev) | |||
743 | static struct pci_device_id wdtpci_pci_tbl[] = { | 730 | static struct pci_device_id wdtpci_pci_tbl[] = { |
744 | { | 731 | { |
745 | .vendor = PCI_VENDOR_ID_ACCESSIO, | 732 | .vendor = PCI_VENDOR_ID_ACCESSIO, |
746 | .device = PCI_DEVICE_ID_WDG_CSM, | 733 | .device = PCI_DEVICE_ID_ACCESSIO_WDG_CSM, |
747 | .subvendor = PCI_ANY_ID, | 734 | .subvendor = PCI_ANY_ID, |
748 | .subdevice = PCI_ANY_ID, | 735 | .subdevice = PCI_ANY_ID, |
749 | }, | 736 | }, |