Re: [PATCH] wdt_pci.c: move ids to pci_ids.h

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi H Hartley,

Patch added to linux-2.6-watchdog-next .

Kind regards,
Wim.

> Move the VENDOR/DEVICE ids to pci_ids.h.
> 
> Signed-off-by: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx>
> Cc: Wim Van Sebroeck <wim@xxxxxxxxx>
> Cc: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
> 
> ---
> 
> diff --git a/drivers/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c
> index 7b22e3c..6130c88 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,
>  	},
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index 9f688d2..e4551f0 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -2367,6 +2367,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
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [DMA Engine]     [Linux Coverity]     [Linux USB]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Greybus]

  Powered by Linux