Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9f2cc6f759ca0b072107c171a3b5cd79c7ea5de3

Authored by H Hartley Sweeten
Committed by Wim Van Sebroeck
1 parent 9a37256313
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 2 changed files with 4 additions and 14 deletions Side-by-side Diff

drivers/watchdog/wdt_pci.c
Diff comments   View file @ 9f2cc6f
... ... @@ -60,19 +60,6 @@
60 60  
61 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 63 /* We can only use 1 card due to the /dev/watchdog restriction */
77 64 static int dev_count;
78 65  
... ... @@ -743,7 +730,7 @@
743 730 static struct pci_device_id wdtpci_pci_tbl[] = {
744 731 {
745 732 .vendor = PCI_VENDOR_ID_ACCESSIO,
746   - .device = PCI_DEVICE_ID_WDG_CSM,
  733 + .device = PCI_DEVICE_ID_ACCESSIO_WDG_CSM,
747 734 .subvendor = PCI_ANY_ID,
748 735 .subdevice = PCI_ANY_ID,
749 736 },
include/linux/pci_ids.h
Diff comments   View file @ 9f2cc6f
... ... @@ -2372,6 +2372,9 @@
2372 2372 #define PCI_VENDOR_ID_AKS 0x416c
2373 2373 #define PCI_DEVICE_ID_AKS_ALADDINCARD 0x0100
2374 2374  
  2375 +#define PCI_VENDOR_ID_ACCESSIO 0x494f
  2376 +#define PCI_DEVICE_ID_ACCESSIO_WDG_CSM 0x22c0
  2377 +
2375 2378 #define PCI_VENDOR_ID_S3 0x5333
2376 2379 #define PCI_DEVICE_ID_S3_TRIO 0x8811
2377 2380 #define PCI_DEVICE_ID_S3_868 0x8880