Skip to contentSkip to conversation

Incorrect patch merged (Fwd: [PATCH] fdomain_cs needs ISA])

PATCH Alan Cox 1 participant 1 message Jul 29, 2004

lore
Share & tools
lore

Alan Cox

author
#0 lore raw

fdomain_cs only needs PCMCIA, PCMCIA _is_ ISA bus with wrappers. The problem arises because the driver uses isa_readb not ioremap when doing bios scans that are only in the non PCMCIA code path. This broken patch breaks fdomain_cs on platforms that it supports just fine.

The real fix is

scsi/fdomain.c renamed from scsi/fdomain.c~ +4 -0
@@ -681,6 +681,7 @@
 
 static int fdomain_isa_detect( int *irq, int *iobase )
 {
+#ifndef PCMCIA
    int i, j;
    int base = 0xdeadbeef;
    int flag = 0;

@@ -786,6 +787,9 @@
    *iobase = base;
 
    return 1;			/* success */
+#else
+   return 0;
+#endif   
 }
 
 /* PCI detection function: int fdomain_pci_bios_detect(int* irq, int*

-----Forwarded Message-----

Quoted 39 lines

From: Linux Kernel Mailing List <[email protected]>
To: [email protected]
Subject: [PATCH] fdomain_cs needs ISA
Date: Thu, 29 Jul 2004 06:02:05 +0000

ChangeSet 1.1844, 2004/07/28 23:02:05-07:00, [email protected]

[PATCH] fdomain_cs needs ISA

drivers/scsi/pcmcia/fdomain_cs.ko needs unknown symbol isa_memcpy_fromio drivers/scsi/pcmcia/fdomain_cs.ko needs unknown symbol isa_readb

iirc the isa bus isn't available on ppc.

Signed-off-by Andrew Morton <[email protected]>
Signed-off-by Linus Torvalds <[email protected]>
 Kconfig |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -Nru a/drivers/scsi/pcmcia/Kconfig b/drivers/scsi/pcmcia/Kconfig

drivers/scsi/pcmcia/Kconfig +1 -2
@@ -17,7 +17,7 @@
 
 config PCMCIA_FDOMAIN
 	tristate "Future Domain PCMCIA support"
-	depends on m
+	depends on m && ISA
 	help
 	  Say Y here if you intend to attach this type of PCMCIA SCSI host
 	  adapter to your computer.
-

To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html