The patch titled
declance: Support the I/O ASIC LANCE w/o TURBOchannel
has been added to the -mm tree. Its filename is
declance-support-the-i-o-asic-lance-w-o-turbochannel.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: declance: Support the I/O ASIC LANCE w/o TURBOchannel
From: "Maciej W. Rozycki" <macro@xxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxx>
Cc: Jeff Garzik <jeff@xxxxxxxxxx>
Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/declance.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff -puN drivers/net/declance.c~declance-support-the-i-o-asic-lance-w-o-turbochannel drivers/net/declance.c
--- a/drivers/net/declance.c~declance-support-the-i-o-asic-lance-w-o-turbochannel
+++ a/drivers/net/declance.c
@@ -1065,7 +1065,6 @@ static int __init dec_lance_init(const i
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 i
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 i
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++;
_
Patches currently in -mm which might be from macro@xxxxxxxxxxxxxx are
git-netdev-all.patch
declance-fix-pmax-and-pmad-support.patch
declance-fix-pmax-and-pmad-support-fix.patch
declance-support-the-i-o-asic-lance-w-o-turbochannel.patch
dz-fixes-to-make-it-work.patch
dz-fixes-to-make-it-work-fix.patch
pmagb-b-fb-fix-a-default-clock.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
