[PATCH] fdomain_cs ISA fix

Revert the recent fdomain_cs config dependency "fix" and fix the linkage
error with ifdeffery instead.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c
index 3b749ddd0c0949cd953deb5de4eba9de13c4e08b..6529f0c557724ebfa9f9794eb877f28e73ca926c 100644 (file)
--- a/drivers/scsi/fdomain.c
+++ b/drivers/scsi/fdomain.c
@@ -681,6 +681,7 @@ static int fdomain_get_irq( int base )
 
 static int fdomain_isa_detect( int *irq, int *iobase )
 {
+#ifndef PCMCIA
    int i, j;
    int base = 0xdeadbeef;
    int flag = 0;
@@ -786,6 +787,9 @@ static int fdomain_isa_detect( int *irq, int *iobase )
    *iobase = base;
 
    return 1;                   /* success */
+#else
+   return 0;
+#endif
 }
 
 /* PCI detection function: int fdomain_pci_bios_detect(int* irq, int*

diff --git a/drivers/scsi/pcmcia/Kconfig b/drivers/scsi/pcmcia/Kconfig
index b7d208e60886eb33d1d6b8e53fef0b58cbd3ec2f..df52190f4d94e0301b1b707a6e2eb313cc9690dd 100644 (file)
--- a/drivers/scsi/pcmcia/Kconfig
+++ b/drivers/scsi/pcmcia/Kconfig
@@ -17,7 +17,7 @@ config PCMCIA_AHA152X
 
 config PCMCIA_FDOMAIN
        tristate "Future Domain PCMCIA support"
-       depends on m && ISA
+       depends on m
        help
          Say Y here if you intend to attach this type of PCMCIA SCSI host
          adapter to your computer.