aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordavem <davem>2002-01-15 05:35:33 +0000
committerdavem <davem>2002-01-15 05:35:33 +0000
commitb6aa18b27ed85834e4ad74e4f7ec52fcdebddfe1 (patch)
treed3450903d1a873c6eb15256ceb4defcccfae5050
parent31824c6359507be0612933ceba36d445afbf8742 (diff)
downloadnetdev-vger-cvs-b6aa18b27ed85834e4ad74e4f7ec52fcdebddfe1.tar.gz
Fix build...
-rw-r--r--drivers/net/sungem.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 00b705281..cd118255d 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -1,4 +1,4 @@
-/* $Id: sungem.c,v 1.45 2002-01-12 07:19:55 davem Exp $
+/* $Id: sungem.c,v 1.46 2002-01-15 05:35:33 davem Exp $
* sungem.c: Sun GEM ethernet driver.
*
* Copyright (C) 2000, 2001 David S. Miller (davem@redhat.com)
@@ -94,6 +94,11 @@ static u16 link_modes[] __devinitdata = {
#define GEM_MODULE_NAME "gem"
#define PFX GEM_MODULE_NAME ": "
+/* Until this gets merged from 2.4.x... */
+#ifndef PCI_DEVICE_ID_APPLE_UNI_N_GMACP
+#define PCI_DEVICE_ID_APPLE_UNI_N_GMACP 0x0024
+#endif
+
static struct pci_device_id gem_pci_tbl[] __devinitdata = {
{ PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_GEM,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
@@ -2829,7 +2834,7 @@ static struct pci_driver gem_driver = {
name: GEM_MODULE_NAME,
id_table: gem_pci_tbl,
probe: gem_init_one,
- remove: __devexit_p(gem_remove_one),
+ remove: gem_remove_one,
#ifdef CONFIG_PM
suspend: gem_suspend,
resume: gem_resume,