diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/hw_random/intel-rng.c | 76 | ||||
-rw-r--r-- | drivers/char/watchdog/alim7101_wdt.c | 6 |
2 files changed, 40 insertions, 42 deletions
diff --git a/drivers/char/hw_random/intel-rng.c b/drivers/char/hw_random/intel-rng.c index f22e78e3c70f..cc1046e6ee02 100644 --- a/drivers/char/hw_random/intel-rng.c +++ b/drivers/char/hw_random/intel-rng.c | |||
@@ -96,49 +96,49 @@ | |||
96 | */ | 96 | */ |
97 | static const struct pci_device_id pci_tbl[] = { | 97 | static const struct pci_device_id pci_tbl[] = { |
98 | /* AA | 98 | /* AA |
99 | { 0x8086, 0x2418, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, */ | 99 | { PCI_DEVICE(0x8086, 0x2418) }, */ |
100 | { 0x8086, 0x2410, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* AA */ | 100 | { PCI_DEVICE(0x8086, 0x2410) }, /* AA */ |
101 | /* AB | 101 | /* AB |
102 | { 0x8086, 0x2428, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, */ | 102 | { PCI_DEVICE(0x8086, 0x2428) }, */ |
103 | { 0x8086, 0x2420, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* AB */ | 103 | { PCI_DEVICE(0x8086, 0x2420) }, /* AB */ |
104 | /* ?? | 104 | /* ?? |
105 | { 0x8086, 0x2430, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, */ | 105 | { PCI_DEVICE(0x8086, 0x2430) }, */ |
106 | /* BAM, CAM, DBM, FBM, GxM | 106 | /* BAM, CAM, DBM, FBM, GxM |
107 | { 0x8086, 0x2448, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, */ | 107 | { PCI_DEVICE(0x8086, 0x2448) }, */ |
108 | { 0x8086, 0x244c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* BAM */ | 108 | { PCI_DEVICE(0x8086, 0x244c) }, /* BAM */ |
109 | { 0x8086, 0x248c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* CAM */ | 109 | { PCI_DEVICE(0x8086, 0x248c) }, /* CAM */ |
110 | { 0x8086, 0x24cc, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* DBM */ | 110 | { PCI_DEVICE(0x8086, 0x24cc) }, /* DBM */ |
111 | { 0x8086, 0x2641, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* FBM */ | 111 | { PCI_DEVICE(0x8086, 0x2641) }, /* FBM */ |
112 | { 0x8086, 0x27b9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* GxM */ | 112 | { PCI_DEVICE(0x8086, 0x27b9) }, /* GxM */ |
113 | { 0x8086, 0x27bd, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* GxM DH */ | 113 | { PCI_DEVICE(0x8086, 0x27bd) }, /* GxM DH */ |
114 | /* BA, CA, DB, Ex, 6300, Fx, 631x/632x, Gx | 114 | /* BA, CA, DB, Ex, 6300, Fx, 631x/632x, Gx |
115 | { 0x8086, 0x244e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, */ | 115 | { PCI_DEVICE(0x8086, 0x244e) }, */ |
116 | { 0x8086, 0x2440, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* BA */ | 116 | { PCI_DEVICE(0x8086, 0x2440) }, /* BA */ |
117 | { 0x8086, 0x2480, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* CA */ | 117 | { PCI_DEVICE(0x8086, 0x2480) }, /* CA */ |
118 | { 0x8086, 0x24c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* DB */ | 118 | { PCI_DEVICE(0x8086, 0x24c0) }, /* DB */ |
119 | { 0x8086, 0x24d0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Ex */ | 119 | { PCI_DEVICE(0x8086, 0x24d0) }, /* Ex */ |
120 | { 0x8086, 0x25a1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* 6300 */ | 120 | { PCI_DEVICE(0x8086, 0x25a1) }, /* 6300 */ |
121 | { 0x8086, 0x2640, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Fx */ | 121 | { PCI_DEVICE(0x8086, 0x2640) }, /* Fx */ |
122 | { 0x8086, 0x2670, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* 631x/632x */ | 122 | { PCI_DEVICE(0x8086, 0x2670) }, /* 631x/632x */ |
123 | { 0x8086, 0x2671, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* 631x/632x */ | 123 | { PCI_DEVICE(0x8086, 0x2671) }, /* 631x/632x */ |
124 | { 0x8086, 0x2672, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* 631x/632x */ | 124 | { PCI_DEVICE(0x8086, 0x2672) }, /* 631x/632x */ |
125 | { 0x8086, 0x2673, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* 631x/632x */ | 125 | { PCI_DEVICE(0x8086, 0x2673) }, /* 631x/632x */ |
126 | { 0x8086, 0x2674, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* 631x/632x */ | 126 | { PCI_DEVICE(0x8086, 0x2674) }, /* 631x/632x */ |
127 | { 0x8086, 0x2675, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* 631x/632x */ | 127 | { PCI_DEVICE(0x8086, 0x2675) }, /* 631x/632x */ |
128 | { 0x8086, 0x2676, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* 631x/632x */ | 128 | { PCI_DEVICE(0x8086, 0x2676) }, /* 631x/632x */ |
129 | { 0x8086, 0x2677, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* 631x/632x */ | 129 | { PCI_DEVICE(0x8086, 0x2677) }, /* 631x/632x */ |
130 | { 0x8086, 0x2678, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* 631x/632x */ | 130 | { PCI_DEVICE(0x8086, 0x2678) }, /* 631x/632x */ |
131 | { 0x8086, 0x2679, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* 631x/632x */ | 131 | { PCI_DEVICE(0x8086, 0x2679) }, /* 631x/632x */ |
132 | { 0x8086, 0x267a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* 631x/632x */ | 132 | { PCI_DEVICE(0x8086, 0x267a) }, /* 631x/632x */ |
133 | { 0x8086, 0x267b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* 631x/632x */ | 133 | { PCI_DEVICE(0x8086, 0x267b) }, /* 631x/632x */ |
134 | { 0x8086, 0x267c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* 631x/632x */ | 134 | { PCI_DEVICE(0x8086, 0x267c) }, /* 631x/632x */ |
135 | { 0x8086, 0x267d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* 631x/632x */ | 135 | { PCI_DEVICE(0x8086, 0x267d) }, /* 631x/632x */ |
136 | { 0x8086, 0x267e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* 631x/632x */ | 136 | { PCI_DEVICE(0x8086, 0x267e) }, /* 631x/632x */ |
137 | { 0x8086, 0x267f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* 631x/632x */ | 137 | { PCI_DEVICE(0x8086, 0x267f) }, /* 631x/632x */ |
138 | { 0x8086, 0x27b8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Gx */ | 138 | { PCI_DEVICE(0x8086, 0x27b8) }, /* Gx */ |
139 | /* E | 139 | /* E |
140 | { 0x8086, 0x245e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, */ | 140 | { PCI_DEVICE(0x8086, 0x245e) }, */ |
141 | { 0x8086, 0x2450, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* E */ | 141 | { PCI_DEVICE(0x8086, 0x2450) }, /* E */ |
142 | { 0, }, /* terminate list */ | 142 | { 0, }, /* terminate list */ |
143 | }; | 143 | }; |
144 | MODULE_DEVICE_TABLE(pci, pci_tbl); | 144 | MODULE_DEVICE_TABLE(pci, pci_tbl); |
diff --git a/drivers/char/watchdog/alim7101_wdt.c b/drivers/char/watchdog/alim7101_wdt.c index bf25d0a55a99..e5b2c2ee292c 100644 --- a/drivers/char/watchdog/alim7101_wdt.c +++ b/drivers/char/watchdog/alim7101_wdt.c | |||
@@ -417,10 +417,8 @@ module_init(alim7101_wdt_init); | |||
417 | module_exit(alim7101_wdt_unload); | 417 | module_exit(alim7101_wdt_unload); |
418 | 418 | ||
419 | static struct pci_device_id alim7101_pci_tbl[] __devinitdata = { | 419 | static struct pci_device_id alim7101_pci_tbl[] __devinitdata = { |
420 | { PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, | 420 | { PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533) }, |
421 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | 421 | { PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101) }, |
422 | { PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101, | ||
423 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | ||
424 | { } | 422 | { } |
425 | }; | 423 | }; |
426 | 424 | ||