git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linville' of git://github.com/kvalo/ath
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
wireless
/
ath
/
ath10k
/
pci.c
diff --git
a/drivers/net/wireless/ath/ath10k/pci.c
b/drivers/net/wireless/ath/ath10k/pci.c
index 1ff2f34e6457fec52a287ab1e4bce945aa576008..056a35a77133f5e1aee4f2ce8b4afb26859b02cb 100644
(file)
--- a/
drivers/net/wireless/ath/ath10k/pci.c
+++ b/
drivers/net/wireless/ath/ath10k/pci.c
@@
-59,7
+59,7
@@
MODULE_PARM_DESC(reset_mode, "0: auto, 1: warm only (default: 0)");
#define QCA988X_2_0_DEVICE_ID (0x003c)
#define QCA988X_2_0_DEVICE_ID (0x003c)
-static
DEFINE_PCI_DEVICE_TABLE(ath10k_pci_id_table)
= {
+static
const struct pci_device_id ath10k_pci_id_table[]
= {
{ PCI_VDEVICE(ATHEROS, QCA988X_2_0_DEVICE_ID) }, /* PCI-E QCA988X V2 */
{0}
};
{ PCI_VDEVICE(ATHEROS, QCA988X_2_0_DEVICE_ID) }, /* PCI-E QCA988X V2 */
{0}
};