diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 15:18:17 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 15:18:17 -0500 |
commit | 12e55508921865aefdd80fd17afe70c191afbd1b (patch) | |
tree | 476b3226fd9602b36bed0934409959bdd24a7eb5 /drivers/staging/wlags49_h2/wl_pci.c | |
parent | 55b81e6f2795484ea8edf5805c95c007cacfa736 (diff) | |
parent | 4d447c9a6ebc0142d320f075c5bac6d202a79fd4 (diff) |
Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (466 commits)
net/hyperv: Add support for jumbo frame up to 64KB
net/hyperv: Add NETVSP protocol version negotiation
net/hyperv: Remove unnecessary kmap_atomic in netvsc driver
staging/rtl8192e: Register against lib80211
staging/rtl8192e: Convert to lib80211_crypt_info
staging/rtl8192e: Convert to lib80211_crypt_data and lib80211_crypt_ops
staging/rtl8192e: Add lib80211.h to rtllib.h
staging/mei: add watchdog device registration wrappers
drm/omap: GEM, deal with cache
staging: vt6656: int.c, int.h: Change return of function to void
staging: usbip: removed unused definitions from header
staging: usbip: removed dead code from receive function
staging:iio: Drop {mark,unmark}_in_use callbacks
staging:iio: Drop buffer mark_param_change callback
staging:iio: Drop the unused buffer enable() and is_enabled() callbacks
staging:iio: Drop buffer busy flag
staging:iio: Make sure a device is only opened once at a time
staging:iio: Disallow modifying buffer size when buffer is enabled
staging:iio: Disallow changing scan elements in all buffered modes
staging:iio: Use iio_buffer_enabled instead of open coding it
...
Fix up conflict in drivers/staging/iio/adc/ad799x_core.c (removal of
module_init due to using module_i2c_driver() helper, next to removal of
MODULE_ALIAS due to using MODULE_DEVICE_TABLE instead).
Diffstat (limited to 'drivers/staging/wlags49_h2/wl_pci.c')
-rw-r--r-- | drivers/staging/wlags49_h2/wl_pci.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/staging/wlags49_h2/wl_pci.c b/drivers/staging/wlags49_h2/wl_pci.c index 1f1d9867917..2bd9b84ace8 100644 --- a/drivers/staging/wlags49_h2/wl_pci.c +++ b/drivers/staging/wlags49_h2/wl_pci.c | |||
@@ -112,17 +112,10 @@ extern dbg_info_t *DbgInfo; | |||
112 | #endif // DBG | 112 | #endif // DBG |
113 | 113 | ||
114 | /* define the PCI device Table Cardname and id tables */ | 114 | /* define the PCI device Table Cardname and id tables */ |
115 | enum hermes_pci_versions { | ||
116 | CH_Agere_Systems_Mini_PCI_V1 = 0, | ||
117 | }; | ||
118 | |||
119 | static struct pci_device_id wl_pci_tbl[] __devinitdata = { | 115 | static struct pci_device_id wl_pci_tbl[] __devinitdata = { |
120 | { PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_0, | 116 | { PCI_DEVICE(PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_0), }, |
121 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Agere_Systems_Mini_PCI_V1 }, | 117 | { PCI_DEVICE(PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_1), }, |
122 | { PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_1, | 118 | { PCI_DEVICE(PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_2), }, |
123 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Agere_Systems_Mini_PCI_V1 }, | ||
124 | { PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_2, | ||
125 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Agere_Systems_Mini_PCI_V1 }, | ||
126 | 119 | ||
127 | { } /* Terminating entry */ | 120 | { } /* Terminating entry */ |
128 | }; | 121 | }; |