diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-10 05:22:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-10 05:22:26 -0400 |
| commit | 65b53e4cc90e59936733b3b95b9451d2ca47528d (patch) | |
| tree | 29932718192962671c48c3fd1ea017a6112459e8 /drivers/net/82596.c | |
| parent | 788c0a53164c05c5ccdb1472474372b72ba74644 (diff) | |
| parent | 2e761e0532a784816e7e822dbaaece8c5d4be14d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tg3.c
drivers/net/wireless/rt2x00/rt2x00dev.c
net/mac80211/ieee80211_i.h
Diffstat (limited to 'drivers/net/82596.c')
| -rw-r--r-- | drivers/net/82596.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/82596.c b/drivers/net/82596.c index 2797da7eeee6..da292e647eb1 100644 --- a/drivers/net/82596.c +++ b/drivers/net/82596.c | |||
| @@ -1162,6 +1162,7 @@ struct net_device * __init i82596_probe(int unit) | |||
| 1162 | memcpy(eth_addr, (void *) 0xfffc1f2c, 6); /* YUCK! Get addr from NOVRAM */ | 1162 | memcpy(eth_addr, (void *) 0xfffc1f2c, 6); /* YUCK! Get addr from NOVRAM */ |
| 1163 | dev->base_addr = MVME_I596_BASE; | 1163 | dev->base_addr = MVME_I596_BASE; |
| 1164 | dev->irq = (unsigned) MVME16x_IRQ_I596; | 1164 | dev->irq = (unsigned) MVME16x_IRQ_I596; |
| 1165 | goto found; | ||
| 1165 | } | 1166 | } |
| 1166 | #endif | 1167 | #endif |
| 1167 | #ifdef ENABLE_BVME6000_NET | 1168 | #ifdef ENABLE_BVME6000_NET |
| @@ -1176,6 +1177,7 @@ struct net_device * __init i82596_probe(int unit) | |||
| 1176 | rtc[3] = msr; | 1177 | rtc[3] = msr; |
| 1177 | dev->base_addr = BVME_I596_BASE; | 1178 | dev->base_addr = BVME_I596_BASE; |
| 1178 | dev->irq = (unsigned) BVME_IRQ_I596; | 1179 | dev->irq = (unsigned) BVME_IRQ_I596; |
| 1180 | goto found; | ||
| 1179 | } | 1181 | } |
| 1180 | #endif | 1182 | #endif |
| 1181 | #ifdef ENABLE_APRICOT | 1183 | #ifdef ENABLE_APRICOT |
| @@ -1212,8 +1214,13 @@ struct net_device * __init i82596_probe(int unit) | |||
| 1212 | } | 1214 | } |
| 1213 | 1215 | ||
| 1214 | dev->irq = 10; | 1216 | dev->irq = 10; |
| 1217 | goto found; | ||
| 1215 | } | 1218 | } |
| 1216 | #endif | 1219 | #endif |
| 1220 | err = -ENODEV; | ||
| 1221 | goto out; | ||
| 1222 | |||
| 1223 | found: | ||
| 1217 | dev->mem_start = (int)__get_free_pages(GFP_ATOMIC, 0); | 1224 | dev->mem_start = (int)__get_free_pages(GFP_ATOMIC, 0); |
| 1218 | if (!dev->mem_start) { | 1225 | if (!dev->mem_start) { |
| 1219 | err = -ENOMEM; | 1226 | err = -ENOMEM; |