diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2004-08-01 20:13:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-01 20:13:18 -0700 |
| commit | 1576eb99ffc7791b5edfa7857cfe5dd6d3d6f887 (patch) | |
| tree | a06315369f8a6200ccdbb5502aa357a607b92472 /drivers | |
| parent | c2c3a9fba94c0a98628d37dff97696c48c154e66 (diff) | |
| download | history-1576eb99ffc7791b5edfa7857cfe5dd6d3d6f887.tar.gz | |
[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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/fdomain.c | 4 | ||||
| -rw-r--r-- | drivers/scsi/pcmcia/Kconfig | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c index 3b749ddd0c0949..6529f0c557724e 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 b7d208e60886eb..df52190f4d94e0 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. |