Commit 9f2cc6f7 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Wim Van Sebroeck
Browse files

watchdog: wdt_pci.c: move ids to pci_ids.h 



Move the VENDOR/DEVICE ids to pci_ids.h.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 9a372563

drivers/watchdog/wdt_pci.c

+1 −14
Original line number Diff line number Diff line
@@ -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,

	},

include/linux/pci_ids.h

+3 −0
Original line number Diff line number Diff line
@@ -2372,6 +2372,9 @@ 
#define PCI_VENDOR_ID_AKS		0x416c

#define PCI_DEVICE_ID_AKS_ALADDINCARD	0x0100



#define PCI_VENDOR_ID_ACCESSIO		0x494f

#define PCI_DEVICE_ID_ACCESSIO_WDG_CSM	0x22c0



#define PCI_VENDOR_ID_S3		0x5333

#define PCI_DEVICE_ID_S3_TRIO		0x8811

#define PCI_DEVICE_ID_S3_868		0x8880