diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-26 14:13:06 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-26 14:13:06 -0500 |
commit | 8ac4ce742c66100931b6f2d7a36b0df08bc721fe (patch) | |
tree | bc44edb8d6ec9057d24aa4c986729e1ca9f3f860 /drivers/ide/ide.c | |
parent | ac87e41116c229fc1efaac0d17fdbfb2185e4629 (diff) |
ide: fix host drivers depending on ide_generic to probe for interfaces (take 2)
* Add mpc8xx_ide_probe() to mpc8xx.c and call it from probe_for_hwifs().
* Convert ide_arm, ide-cris, ide-h8300, ide-pnp, buddha, falconide, gayle,
macide, q40ide, cmd640 and mpc8xx host drivers to use ide_device_add().
This removes dependency on ide_generic for these drivers so update
ide/Kconfig accordingly.
v2:
* ide_arm build fix (s/ide_device_idx/ide_device_add/)
(Thanks to Christoph Lameter <clameter@sgi.com> for reporting the problem).
Cc: Mikael Starvik <starvik@axis.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
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, 4 insertions, 0 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index 77af743425e8..6f99f5c90062 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c | |||
@@ -1555,6 +1555,7 @@ done: | |||
1555 | extern void __init pnpide_init(void); | 1555 | extern void __init pnpide_init(void); |
1556 | extern void __exit pnpide_exit(void); | 1556 | extern void __exit pnpide_exit(void); |
1557 | extern void __init h8300_ide_init(void); | 1557 | extern void __init h8300_ide_init(void); |
1558 | extern void __init mpc8xx_ide_probe(void); | ||
1558 | 1559 | ||
1559 | /* | 1560 | /* |
1560 | * probe_for_hwifs() finds/initializes "known" IDE interfaces | 1561 | * probe_for_hwifs() finds/initializes "known" IDE interfaces |
@@ -1619,6 +1620,9 @@ static void __init probe_for_hwifs (void) | |||
1619 | #ifdef CONFIG_H8300 | 1620 | #ifdef CONFIG_H8300 |
1620 | h8300_ide_init(); | 1621 | h8300_ide_init(); |
1621 | #endif | 1622 | #endif |
1623 | #ifdef BLK_DEV_MPC8xx_IDE | ||
1624 | mpc8xx_ide_probe(); | ||
1625 | #endif | ||
1622 | } | 1626 | } |
1623 | 1627 | ||
1624 | /* | 1628 | /* |