diff options
author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
---|---|---|
committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/jazzsonic.c | |
parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/jazzsonic.c')
-rw-r--r-- | drivers/net/jazzsonic.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c index 6e5b3f30527f..3e6aaf9e5ce7 100644 --- a/drivers/net/jazzsonic.c +++ b/drivers/net/jazzsonic.c | |||
@@ -22,11 +22,11 @@ | |||
22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
23 | #include <linux/types.h> | 23 | #include <linux/types.h> |
24 | #include <linux/fcntl.h> | 24 | #include <linux/fcntl.h> |
25 | #include <linux/gfp.h> | ||
25 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
26 | #include <linux/init.h> | 27 | #include <linux/init.h> |
27 | #include <linux/ioport.h> | 28 | #include <linux/ioport.h> |
28 | #include <linux/in.h> | 29 | #include <linux/in.h> |
29 | #include <linux/slab.h> | ||
30 | #include <linux/string.h> | 30 | #include <linux/string.h> |
31 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
32 | #include <linux/errno.h> | 32 | #include <linux/errno.h> |
@@ -35,6 +35,7 @@ | |||
35 | #include <linux/skbuff.h> | 35 | #include <linux/skbuff.h> |
36 | #include <linux/platform_device.h> | 36 | #include <linux/platform_device.h> |
37 | #include <linux/dma-mapping.h> | 37 | #include <linux/dma-mapping.h> |
38 | #include <linux/slab.h> | ||
38 | 39 | ||
39 | #include <asm/bootinfo.h> | 40 | #include <asm/bootinfo.h> |
40 | #include <asm/system.h> | 41 | #include <asm/system.h> |
@@ -81,7 +82,7 @@ static unsigned short known_revisions[] = | |||
81 | 82 | ||
82 | static int jazzsonic_open(struct net_device* dev) | 83 | static int jazzsonic_open(struct net_device* dev) |
83 | { | 84 | { |
84 | if (request_irq(dev->irq, &sonic_interrupt, IRQF_DISABLED, "sonic", dev)) { | 85 | if (request_irq(dev->irq, sonic_interrupt, IRQF_DISABLED, "sonic", dev)) { |
85 | printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, dev->irq); | 86 | printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, dev->irq); |
86 | return -EAGAIN; | 87 | return -EAGAIN; |
87 | } | 88 | } |
@@ -130,8 +131,8 @@ static int __devinit sonic_probe1(struct net_device *dev) | |||
130 | printk("SONIC Silicon Revision = 0x%04x\n",silicon_revision); | 131 | printk("SONIC Silicon Revision = 0x%04x\n",silicon_revision); |
131 | 132 | ||
132 | i = 0; | 133 | i = 0; |
133 | while (known_revisions[i] != 0xffff | 134 | while (known_revisions[i] != 0xffff && |
134 | && known_revisions[i] != silicon_revision) | 135 | known_revisions[i] != silicon_revision) |
135 | i++; | 136 | i++; |
136 | 137 | ||
137 | if (known_revisions[i] == 0xffff) { | 138 | if (known_revisions[i] == 0xffff) { |