aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wan/dscc4.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wan/dscc4.c')
-rw-r--r--drivers/net/wan/dscc4.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index 07d00b4cf48a..a4859f7a7cc0 100644
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -89,6 +89,7 @@
89#include <linux/pci.h> 89#include <linux/pci.h>
90#include <linux/kernel.h> 90#include <linux/kernel.h>
91#include <linux/mm.h> 91#include <linux/mm.h>
92#include <linux/slab.h>
92 93
93#include <asm/system.h> 94#include <asm/system.h>
94#include <asm/cache.h> 95#include <asm/cache.h>
@@ -1128,7 +1129,7 @@ done:
1128 init_timer(&dpriv->timer); 1129 init_timer(&dpriv->timer);
1129 dpriv->timer.expires = jiffies + 10*HZ; 1130 dpriv->timer.expires = jiffies + 10*HZ;
1130 dpriv->timer.data = (unsigned long)dev; 1131 dpriv->timer.data = (unsigned long)dev;
1131 dpriv->timer.function = &dscc4_timer; 1132 dpriv->timer.function = dscc4_timer;
1132 add_timer(&dpriv->timer); 1133 add_timer(&dpriv->timer);
1133 netif_carrier_on(dev); 1134 netif_carrier_on(dev);
1134 1135
@@ -2050,7 +2051,7 @@ static int __init dscc4_setup(char *str)
2050__setup("dscc4.setup=", dscc4_setup); 2051__setup("dscc4.setup=", dscc4_setup);
2051#endif 2052#endif
2052 2053
2053static struct pci_device_id dscc4_pci_tbl[] = { 2054static DEFINE_PCI_DEVICE_TABLE(dscc4_pci_tbl) = {
2054 { PCI_VENDOR_ID_SIEMENS, PCI_DEVICE_ID_SIEMENS_DSCC4, 2055 { PCI_VENDOR_ID_SIEMENS, PCI_DEVICE_ID_SIEMENS_DSCC4,
2055 PCI_ANY_ID, PCI_ANY_ID, }, 2056 PCI_ANY_ID, PCI_ANY_ID, },
2056 { 0,} 2057 { 0,}