aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaciej W. Rozycki <macro@linux-mips.org>2006-12-04 18:04:55 -0500
committerJeff Garzik <jeff@garzik.org>2006-12-04 18:36:02 -0500
commite8f7f7f11d07c3fe3316d57790bae4c561064c33 (patch)
treec5d0e6839e769b9987ee3155031dae1419bef2c5
parent3b6e8fe7eca12fca2cc7fde46ba2a94a86ab0815 (diff)
[PATCH] declance: Support the I/O ASIC LANCE w/o TURBOchannel
The onboard LANCE of I/O ASIC systems is not a TURBOchannel device, at least from the software point of view. Therefore it does not rely on any kernel TURBOchannel bus services and can be supported even if support for TURBOchannel has not been enabled in the configuration. Tested with the onboard LANCE of a DECstation 5000/133. Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org> Cc: Jeff Garzik <jeff@garzik.org> Cc: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/net/declance.c6
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++;