From 490d7a41de3c19868eda8f9a3349240fbb51d101 Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Mon, 4 Dec 2006 15:04:55 -0800 Subject: [PATCH] --- yaml --- r: 43207 b: refs/heads/master c: e8f7f7f11d07c3fe3316d57790bae4c561064c33 h: refs/heads/master i: 43205: 171eedcc629129296c0851ebd131794311c6f869 43203: 0d9edd2f2ecdb5359a1757bb145758be58074ac9 43199: d21b72e8b4c6afee83110df6b5d227700a38d175 v: v3 --- [refs] | 2 +- trunk/drivers/net/declance.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 19e2dc8a8d07..e53ed7679080 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3b6e8fe7eca12fca2cc7fde46ba2a94a86ab0815 +refs/heads/master: e8f7f7f11d07c3fe3316d57790bae4c561064c33 diff --git a/trunk/drivers/net/declance.c b/trunk/drivers/net/declance.c index 1167f8f7c272..4ae0fed7122e 100644 --- a/trunk/drivers/net/declance.c +++ b/trunk/drivers/net/declance.c @@ -1065,7 +1065,6 @@ static int __init dec_lance_init(const int type, const int slot) lp->type = type; lp->slot = slot; switch (type) { -#ifdef CONFIG_TC case ASIC_LANCE: dev->base_addr = CKSEG1ADDR(dec_kn_slot_base + IOASIC_LANCE); @@ -1109,7 +1108,7 @@ static int __init dec_lance_init(const int type, const int slot) CPHYSADDR(dev->mem_start) << 3); break; - +#ifdef CONFIG_TC case PMAD_LANCE: claim_tc_card(slot); @@ -1140,7 +1139,6 @@ static int __init dec_lance_init(const int type, const int slot) break; #endif - case PMAX_LANCE: dev->irq = dec_interrupt[DEC_IRQ_LANCE]; dev->base_addr = CKSEG1ADDR(KN01_SLOT_BASE + KN01_LANCE); @@ -1295,10 +1293,8 @@ static int __init dec_lance_probe(void) /* Then handle onboard devices. */ if (dec_interrupt[DEC_IRQ_LANCE] >= 0) { if (dec_interrupt[DEC_IRQ_LANCE_MERR] >= 0) { -#ifdef CONFIG_TC if (dec_lance_init(ASIC_LANCE, -1) >= 0) count++; -#endif } else if (!TURBOCHANNEL) { if (dec_lance_init(PMAX_LANCE, -1) >= 0) count++;