diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/declance.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/declance.c b/drivers/net/declance.c index 1167f8f7c272..4ae0fed7122e 100644 --- a/drivers/net/declance.c +++ b/drivers/net/declance.c | |||
@@ -1065,7 +1065,6 @@ static int __init dec_lance_init(const int type, const int slot) | |||
1065 | lp->type = type; | 1065 | lp->type = type; |
1066 | lp->slot = slot; | 1066 | lp->slot = slot; |
1067 | switch (type) { | 1067 | switch (type) { |
1068 | #ifdef CONFIG_TC | ||
1069 | case ASIC_LANCE: | 1068 | case ASIC_LANCE: |
1070 | dev->base_addr = CKSEG1ADDR(dec_kn_slot_base + IOASIC_LANCE); | 1069 | dev->base_addr = CKSEG1ADDR(dec_kn_slot_base + IOASIC_LANCE); |
1071 | 1070 | ||
@@ -1109,7 +1108,7 @@ static int __init dec_lance_init(const int type, const int slot) | |||
1109 | CPHYSADDR(dev->mem_start) << 3); | 1108 | CPHYSADDR(dev->mem_start) << 3); |
1110 | 1109 | ||
1111 | break; | 1110 | break; |
1112 | 1111 | #ifdef CONFIG_TC | |
1113 | case PMAD_LANCE: | 1112 | case PMAD_LANCE: |
1114 | claim_tc_card(slot); | 1113 | claim_tc_card(slot); |
1115 | 1114 | ||
@@ -1140,7 +1139,6 @@ static int __init dec_lance_init(const int type, const int slot) | |||
1140 | 1139 | ||
1141 | break; | 1140 | break; |
1142 | #endif | 1141 | #endif |
1143 | |||
1144 | case PMAX_LANCE: | 1142 | case PMAX_LANCE: |
1145 | dev->irq = dec_interrupt[DEC_IRQ_LANCE]; | 1143 | dev->irq = dec_interrupt[DEC_IRQ_LANCE]; |
1146 | dev->base_addr = CKSEG1ADDR(KN01_SLOT_BASE + KN01_LANCE); | 1144 | dev->base_addr = CKSEG1ADDR(KN01_SLOT_BASE + KN01_LANCE); |
@@ -1295,10 +1293,8 @@ static int __init dec_lance_probe(void) | |||
1295 | /* Then handle onboard devices. */ | 1293 | /* Then handle onboard devices. */ |
1296 | if (dec_interrupt[DEC_IRQ_LANCE] >= 0) { | 1294 | if (dec_interrupt[DEC_IRQ_LANCE] >= 0) { |
1297 | if (dec_interrupt[DEC_IRQ_LANCE_MERR] >= 0) { | 1295 | if (dec_interrupt[DEC_IRQ_LANCE_MERR] >= 0) { |
1298 | #ifdef CONFIG_TC | ||
1299 | if (dec_lance_init(ASIC_LANCE, -1) >= 0) | 1296 | if (dec_lance_init(ASIC_LANCE, -1) >= 0) |
1300 | count++; | 1297 | count++; |
1301 | #endif | ||
1302 | } else if (!TURBOCHANNEL) { | 1298 | } else if (!TURBOCHANNEL) { |
1303 | if (dec_lance_init(PMAX_LANCE, -1) >= 0) | 1299 | if (dec_lance_init(PMAX_LANCE, -1) >= 0) |
1304 | count++; | 1300 | count++; |