diff options
Diffstat (limited to 'drivers/net/ethernet/apple/macmace.c')
-rw-r--r-- | drivers/net/ethernet/apple/macmace.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/ethernet/apple/macmace.c b/drivers/net/ethernet/apple/macmace.c index 6cd3f8646dcd..7cf81bbffe0e 100644 --- a/drivers/net/ethernet/apple/macmace.c +++ b/drivers/net/ethernet/apple/macmace.c | |||
@@ -31,9 +31,8 @@ | |||
31 | #include <linux/dma-mapping.h> | 31 | #include <linux/dma-mapping.h> |
32 | #include <linux/platform_device.h> | 32 | #include <linux/platform_device.h> |
33 | #include <linux/gfp.h> | 33 | #include <linux/gfp.h> |
34 | #include <linux/interrupt.h> | ||
34 | #include <asm/io.h> | 35 | #include <asm/io.h> |
35 | #include <asm/irq.h> | ||
36 | #include <asm/macintosh.h> | ||
37 | #include <asm/macints.h> | 36 | #include <asm/macints.h> |
38 | #include <asm/mac_psc.h> | 37 | #include <asm/mac_psc.h> |
39 | #include <asm/page.h> | 38 | #include <asm/page.h> |
@@ -203,14 +202,8 @@ static int __devinit mace_probe(struct platform_device *pdev) | |||
203 | unsigned char *addr; | 202 | unsigned char *addr; |
204 | struct net_device *dev; | 203 | struct net_device *dev; |
205 | unsigned char checksum = 0; | 204 | unsigned char checksum = 0; |
206 | static int found = 0; | ||
207 | int err; | 205 | int err; |
208 | 206 | ||
209 | if (found || macintosh_config->ether_type != MAC_ETHER_MACE) | ||
210 | return -ENODEV; | ||
211 | |||
212 | found = 1; /* prevent 'finding' one on every device probe */ | ||
213 | |||
214 | dev = alloc_etherdev(PRIV_BYTES); | 207 | dev = alloc_etherdev(PRIV_BYTES); |
215 | if (!dev) | 208 | if (!dev) |
216 | return -ENOMEM; | 209 | return -ENOMEM; |