summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <b.zolnierkiewicz@elka.pw.edu.pl>2003-05-29 20:52:29 -0700
committerJens Axboe <axboe@suse.de>2003-05-29 20:52:29 -0700
commit23898e5c591af431d19fdaa14062940e30bba292 (patch)
treecb4dca153c8868ae932b78d4cff63fd68fb3371d
parent83169a1aaf82854b0956149d9dd719d300f0115d (diff)
[PATCH] allow "hdX=scsi" for modular scsi/ide-scsi
Allow a user to mark a device as for scsi emulation at boot even with modular scsi/ide-scsi. (from 2.4 patch by Matan Ziv-Av)
-rw-r--r--drivers/ide/ide.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index e3347a6642a7..96e450c3e982 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -1924,13 +1924,8 @@ int __init ide_setup (char *s)
drive->remap_0_to_1 = 2;
goto done;
case -14: /* "scsi" */
-#if defined(CONFIG_BLK_DEV_IDESCSI) && defined(CONFIG_SCSI)
drive->scsi = 1;
goto done;
-#else
- drive->scsi = 0;
- goto bad_option;
-#endif /* defined(CONFIG_BLK_DEV_IDESCSI) && defined(CONFIG_SCSI) */
case -15: /* "biostimings" */
drive->autotune = IDE_TUNE_BIOS;
goto done;