diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2010-05-21 18:38:52 -0500 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2010-08-08 18:20:38 +0000 |
| commit | 9f2cc6f759ca0b072107c171a3b5cd79c7ea5de3 (patch) | |
| tree | f481487fa3ce2c5a38f90fb2333d860ca97ad854 /drivers/watchdog | |
| parent | 9a3725631331f279fa44b6522874ce8818bcc455 (diff) | |
| download | linux-3.10-9f2cc6f759ca0b072107c171a3b5cd79c7ea5de3.tar.gz linux-3.10-9f2cc6f759ca0b072107c171a3b5cd79c7ea5de3.tar.bz2 linux-3.10-9f2cc6f759ca0b072107c171a3b5cd79c7ea5de3.zip | |
watchdog: wdt_pci.c: move ids to pci_ids.h
Move the VENDOR/DEVICE ids to pci_ids.h.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
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 7b22e3cdbc8..6130c88fa5a 100644 --- a/drivers/watchdog/wdt_pci.c +++ b/drivers/watchdog/wdt_pci.c @@ -60,19 +60,6 @@ #define PFX "wdt_pci: " -/* - * Until Access I/O gets their application for a PCI vendor ID approved, - * I don't think that it's appropriate to move these constants into the - * regular pci_ids.h file. -- JPN 2000/01/18 - */ - -#ifndef PCI_VENDOR_ID_ACCESSIO -#define PCI_VENDOR_ID_ACCESSIO 0x494f -#endif -#ifndef PCI_DEVICE_ID_WDG_CSM -#define PCI_DEVICE_ID_WDG_CSM 0x22c0 -#endif - /* We can only use 1 card due to the /dev/watchdog restriction */ static int dev_count; @@ -743,7 +730,7 @@ static void __devexit wdtpci_remove_one(struct pci_dev *pdev) static struct pci_device_id wdtpci_pci_tbl[] = { { .vendor = PCI_VENDOR_ID_ACCESSIO, - .device = PCI_DEVICE_ID_WDG_CSM, + .device = PCI_DEVICE_ID_ACCESSIO_WDG_CSM, .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, }, |