From 1576eb99ffc7791b5edfa7857cfe5dd6d3d6f887 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Sun, 1 Aug 2004 20:13:18 -0700 Subject: [PATCH] [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 Signed-off-by: Linus Torvalds --- drivers/scsi/fdomain.c | 4 ++++ drivers/scsi/pcmcia/Kconfig | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c index 3b749ddd0c09..6529f0c55772 100644 --- 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 b7d208e60886..df52190f4d94 100644 --- 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. -- 2.39.5