diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-17 18:46:23 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-17 18:46:23 -0400 |
commit | fef39d95ea19d4b5e2547e344809a5398eba8b3c (patch) | |
tree | 86ffa7c0442493486551efe2d9ec26b97b7cb981 /drivers/ide/ide-probe.c | |
parent | f0298512c86ebc2eae9f4556d0b15087aa750646 (diff) |
ide: remove needless CONFIG_BLK_DEV_HD hack from init_hwif()
request_irq() will fail if there is already another IRQ handler
registered and IRQ flags are mismatched.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-probe.c')
-rw-r--r-- | drivers/ide/ide-probe.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 510254ab3c9b..8ef5194f6d47 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
@@ -1241,13 +1241,6 @@ static int hwif_init(ide_hwif_t *hwif) | |||
1241 | return 0; | 1241 | return 0; |
1242 | } | 1242 | } |
1243 | } | 1243 | } |
1244 | #ifdef CONFIG_BLK_DEV_HD | ||
1245 | if (hwif->irq == HD_IRQ && hwif->io_ports[IDE_DATA_OFFSET] != HD_DATA) { | ||
1246 | printk("%s: CANNOT SHARE IRQ WITH OLD " | ||
1247 | "HARDDISK DRIVER (hd.c)\n", hwif->name); | ||
1248 | return 0; | ||
1249 | } | ||
1250 | #endif /* CONFIG_BLK_DEV_HD */ | ||
1251 | 1244 | ||
1252 | if (register_blkdev(hwif->major, hwif->name)) | 1245 | if (register_blkdev(hwif->major, hwif->name)) |
1253 | return 0; | 1246 | return 0; |