diff options
Diffstat (limited to 'drivers/net/arcnet/arc-rimi.c')
-rw-r--r-- | drivers/net/arcnet/arc-rimi.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/arcnet/arc-rimi.c b/drivers/net/arcnet/arc-rimi.c index e3082a9350fc..9efbbbae47ca 100644 --- a/drivers/net/arcnet/arc-rimi.c +++ b/drivers/net/arcnet/arc-rimi.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <linux/module.h> | 28 | #include <linux/module.h> |
29 | #include <linux/moduleparam.h> | 29 | #include <linux/moduleparam.h> |
30 | #include <linux/ioport.h> | 30 | #include <linux/ioport.h> |
31 | #include <linux/slab.h> | ||
32 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
33 | #include <linux/netdevice.h> | 32 | #include <linux/netdevice.h> |
34 | #include <linux/bootmem.h> | 33 | #include <linux/bootmem.h> |
@@ -156,7 +155,7 @@ static int __init arcrimi_found(struct net_device *dev) | |||
156 | } | 155 | } |
157 | 156 | ||
158 | /* reserve the irq */ | 157 | /* reserve the irq */ |
159 | if (request_irq(dev->irq, &arcnet_interrupt, 0, "arcnet (RIM I)", dev)) { | 158 | if (request_irq(dev->irq, arcnet_interrupt, 0, "arcnet (RIM I)", dev)) { |
160 | iounmap(p); | 159 | iounmap(p); |
161 | release_mem_region(dev->mem_start, MIRROR_SIZE); | 160 | release_mem_region(dev->mem_start, MIRROR_SIZE); |
162 | BUGMSG(D_NORMAL, "Can't get IRQ %d!\n", dev->irq); | 161 | BUGMSG(D_NORMAL, "Can't get IRQ %d!\n", dev->irq); |
@@ -174,9 +173,9 @@ static int __init arcrimi_found(struct net_device *dev) | |||
174 | * 2k (or there are no mirrors at all) but on some, it's 4k. | 173 | * 2k (or there are no mirrors at all) but on some, it's 4k. |
175 | */ | 174 | */ |
176 | mirror_size = MIRROR_SIZE; | 175 | mirror_size = MIRROR_SIZE; |
177 | if (readb(p) == TESTvalue | 176 | if (readb(p) == TESTvalue && |
178 | && check_mirror(shmem - MIRROR_SIZE, MIRROR_SIZE) == 0 | 177 | check_mirror(shmem - MIRROR_SIZE, MIRROR_SIZE) == 0 && |
179 | && check_mirror(shmem - 2 * MIRROR_SIZE, MIRROR_SIZE) == 1) | 178 | check_mirror(shmem - 2 * MIRROR_SIZE, MIRROR_SIZE) == 1) |
180 | mirror_size = 2 * MIRROR_SIZE; | 179 | mirror_size = 2 * MIRROR_SIZE; |
181 | 180 | ||
182 | first_mirror = shmem - mirror_size; | 181 | first_mirror = shmem - mirror_size; |