diff options
| -rw-r--r-- | linux/dev/glue/block.c | 5 | ||||
| -rw-r--r-- | linux/src/drivers/block/ide.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/linux/dev/glue/block.c b/linux/dev/glue/block.c index 6855a231..a8307813 100644 --- a/linux/dev/glue/block.c +++ b/linux/dev/glue/block.c @@ -206,7 +206,10 @@ int blk_dev_init () { #ifdef CONFIG_BLK_DEV_IDE - ide_init (); + extern char *kernel_cmdline; + if (strncmp(kernel_cmdline, "noide", 5) && + !strstr(kernel_cmdline, " noide")) + 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 67d939a9..c8dee846 100644 --- a/linux/src/drivers/block/ide.c +++ b/linux/src/drivers/block/ide.c @@ -3725,7 +3725,10 @@ static void probe_for_hwifs (void) #ifdef CONFIG_BLK_DEV_PROMISE init_dc4030(); #endif - ahci_probe_pci(); + extern char *kernel_cmdline; + if (strncmp(kernel_cmdline, "noahci", 6) && + !strstr(kernel_cmdline, " noahci")) + ahci_probe_pci(); } static int hwif_init (int h) |