diff options
author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-08 01:31:11 -0400 |
---|---|---|
committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-08 01:31:11 -0400 |
commit | 334d0dd8b660557608142f0f77abc6812b48f08b (patch) | |
tree | 9393a9aa099d7d42deda5f9f5054796c0c769be7 /drivers/net/Space.c | |
parent | 3f07d8796262f6aee135c8dd9a91210da9f888e4 (diff) | |
parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/Space.c')
-rw-r--r-- | drivers/net/Space.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/Space.c b/drivers/net/Space.c index dd8ed456c8b2..1c3e293fbaf7 100644 --- a/drivers/net/Space.c +++ b/drivers/net/Space.c | |||
@@ -83,7 +83,6 @@ extern struct net_device *bagetlance_probe(int unit); | |||
83 | extern struct net_device *mvme147lance_probe(int unit); | 83 | extern struct net_device *mvme147lance_probe(int unit); |
84 | extern struct net_device *tc515_probe(int unit); | 84 | extern struct net_device *tc515_probe(int unit); |
85 | extern struct net_device *lance_probe(int unit); | 85 | extern struct net_device *lance_probe(int unit); |
86 | extern struct net_device *mace_probe(int unit); | ||
87 | extern struct net_device *mac8390_probe(int unit); | 86 | extern struct net_device *mac8390_probe(int unit); |
88 | extern struct net_device *mac89x0_probe(int unit); | 87 | extern struct net_device *mac89x0_probe(int unit); |
89 | extern struct net_device *mc32_probe(int unit); | 88 | extern struct net_device *mc32_probe(int unit); |
@@ -274,9 +273,6 @@ static struct devprobe2 m68k_probes[] __initdata = { | |||
274 | #ifdef CONFIG_MVME147_NET /* MVME147 internal Ethernet */ | 273 | #ifdef CONFIG_MVME147_NET /* MVME147 internal Ethernet */ |
275 | {mvme147lance_probe, 0}, | 274 | {mvme147lance_probe, 0}, |
276 | #endif | 275 | #endif |
277 | #ifdef CONFIG_MACMACE /* Mac 68k Quadra AV builtin Ethernet */ | ||
278 | {mace_probe, 0}, | ||
279 | #endif | ||
280 | #ifdef CONFIG_MAC8390 /* NuBus NS8390-based cards */ | 276 | #ifdef CONFIG_MAC8390 /* NuBus NS8390-based cards */ |
281 | {mac8390_probe, 0}, | 277 | {mac8390_probe, 0}, |
282 | #endif | 278 | #endif |