diff options
Diffstat (limited to 'drivers/net/cassini.c')
| -rw-r--r-- | drivers/net/cassini.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c index f857afe8e488..ad47e5126fde 100644 --- a/drivers/net/cassini.c +++ b/drivers/net/cassini.c | |||
| @@ -106,7 +106,7 @@ | |||
| 106 | #define cas_page_unmap(x) kunmap_atomic((x), KM_SKB_DATA_SOFTIRQ) | 106 | #define cas_page_unmap(x) kunmap_atomic((x), KM_SKB_DATA_SOFTIRQ) |
| 107 | #define CAS_NCPUS num_online_cpus() | 107 | #define CAS_NCPUS num_online_cpus() |
| 108 | 108 | ||
| 109 | #if defined(CONFIG_CASSINI_NAPI) && defined(HAVE_NETDEV_POLL) | 109 | #ifdef CONFIG_CASSINI_NAPI |
| 110 | #define USE_NAPI | 110 | #define USE_NAPI |
| 111 | #define cas_skb_release(x) netif_receive_skb(x) | 111 | #define cas_skb_release(x) netif_receive_skb(x) |
| 112 | #else | 112 | #else |
| @@ -236,7 +236,7 @@ static u16 link_modes[] __devinitdata = { | |||
| 236 | CAS_BMCR_SPEED1000|BMCR_FULLDPLX /* 5 : 1000bt full duplex */ | 236 | CAS_BMCR_SPEED1000|BMCR_FULLDPLX /* 5 : 1000bt full duplex */ |
| 237 | }; | 237 | }; |
| 238 | 238 | ||
| 239 | static struct pci_device_id cas_pci_tbl[] __devinitdata = { | 239 | static DEFINE_PCI_DEVICE_TABLE(cas_pci_tbl) = { |
| 240 | { PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_CASSINI, | 240 | { PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_CASSINI, |
| 241 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, | 241 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, |
| 242 | { PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SATURN, | 242 | { PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SATURN, |