diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-17 18:46:24 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-17 18:46:24 -0400 |
commit | 80aa31cb460d12c1e02327b43eceb3eebc6e7090 (patch) | |
tree | c9f77aab26f78002d38d941cf62dafd23b4d9146 /drivers/ide/ide.c | |
parent | fef39d95ea19d4b5e2547e344809a5398eba8b3c (diff) |
ide: remove CONFIG_BLK_DEV_HD_IDE config option (take 2)
* Remove CONFIG_BLK_DEV_HD hack from init_hwif_default()
("hda=noprobe hdb=noprobe" kernel parameters should be used
instead if somebody wishes to use the old "hd" driver).
* Make CONFIG_BLK_DEV_HD_ONLY config option available also when
IDE subsystem is used and update help entry.
* Remove no longer needed CONFIG_BLK_DEV_HD_IDE config option.
v2:
* Update documentation to suggest "hda=noprobe hdb=noprobe"
instead of obsoleted "ide0=noprobe".
* Update Documentation/ide/ide.txt.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide.c')
-rw-r--r-- | drivers/ide/ide.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index d791b1ffb586..96126b3b12e9 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c | |||
@@ -177,10 +177,6 @@ static void init_hwif_default(ide_hwif_t *hwif, unsigned int index) | |||
177 | memcpy(hwif->io_ports, hw.io_ports, sizeof(hw.io_ports)); | 177 | memcpy(hwif->io_ports, hw.io_ports, sizeof(hw.io_ports)); |
178 | 178 | ||
179 | hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET]; | 179 | hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET]; |
180 | #ifdef CONFIG_BLK_DEV_HD | ||
181 | if (hwif->io_ports[IDE_DATA_OFFSET] == HD_DATA) | ||
182 | hwif->noprobe = 1; /* may be overridden by ide_setup() */ | ||
183 | #endif | ||
184 | } | 180 | } |
185 | 181 | ||
186 | /* | 182 | /* |