diff options
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/dev/glue/block.c | 5 | ||||
| -rw-r--r-- | linux/src/drivers/block/ide.c | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/linux/dev/glue/block.c b/linux/dev/glue/block.c index 950413df..6730c5ec 100644 --- a/linux/dev/glue/block.c +++ b/linux/dev/glue/block.c @@ -207,10 +207,7 @@ int blk_dev_init () { #ifdef CONFIG_BLK_DEV_IDE - extern char *kernel_cmdline; - if (strncmp(kernel_cmdline, "noide", 5) && - !strstr(kernel_cmdline, " noide")) - ide_init (); + ide_init (); #endif #ifdef CONFIG_BLK_DEV_FD floppy_init (); diff --git a/linux/src/drivers/block/ide.c b/linux/src/drivers/block/ide.c index f3b78831..2d0fc77e 100644 --- a/linux/src/drivers/block/ide.c +++ b/linux/src/drivers/block/ide.c @@ -3725,10 +3725,7 @@ static void probe_for_hwifs (void) #ifdef CONFIG_BLK_DEV_PROMISE init_dc4030(); #endif - extern char *kernel_cmdline; - if (strncmp(kernel_cmdline, "noahci", 6) && - !strstr(kernel_cmdline, " noahci")) - ahci_probe_pci(); + ahci_probe_pci(); } static int hwif_init (int h) |