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 remote-tracking branch 'iwlwifi-fixes/master' into NEXT
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
wan
/
dscc4.c
diff --git
a/drivers/net/wan/dscc4.c
b/drivers/net/wan/dscc4.c
index 288610df205c29efedcb4fb039998176de63746c..08223569cebdf361f7e9ea5408ac56221612874e 100644
(file)
--- a/
drivers/net/wan/dscc4.c
+++ b/
drivers/net/wan/dscc4.c
@@
-2039,7
+2039,7
@@
static int __init dscc4_setup(char *str)
__setup("dscc4.setup=", dscc4_setup);
#endif
-static
DEFINE_PCI_DEVICE_TABLE(dscc4_pci_tbl)
= {
+static
const struct pci_device_id dscc4_pci_tbl[]
= {
{ PCI_VENDOR_ID_SIEMENS, PCI_DEVICE_ID_SIEMENS_DSCC4,
PCI_ANY_ID, PCI_ANY_ID, },
{ 0,}