Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-omap-h63xx.git] / drivers / ide / legacy / buddha.c

diff --git a/drivers/ide/legacy/buddha.c b/drivers/ide/legacy/buddha.c
index c61bc6a1db3627e0cda9dd262ec2096859c6b450..7c2afa97f41775e410835d539a174d14452f75ed 100644 (file)
--- a/drivers/ide/legacy/buddha.c
+++ b/drivers/ide/legacy/buddha.c
@@ -150,18 +150,14 @@ static void __init buddha_setup_ports(hw_regs_t *hw, unsigned long base,
 
 static int __init buddha_init(void)
 {
-       ide_hwif_t *hwif;
-       int i;
-
        struct zorro_dev *z = NULL;
        u_long buddha_board = 0;
        BuddhaType type;
-       int buddha_num_hwifs;
+       int buddha_num_hwifs, i;
 
        while ((z = zorro_find_device(ZORRO_WILDCARD, z))) {
                unsigned long board;
                hw_regs_t hw[MAX_NUM_HWIFS], *hws[] = { NULL, NULL, NULL, NULL };
-               u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
 
                if (z->id == ZORRO_PROD_INDIVIDUAL_COMPUTERS_BUDDHA) {
                        buddha_num_hwifs = BUDDHA_NUM_HWIFS;
@@ -226,16 +222,10 @@ fail_base2:
                        buddha_setup_ports(&hw[i], base, ctl, irq_port,
                                           ack_intr);
 
-                       hwif = ide_find_port();
-                       if (hwif) {
-                               hwif->chipset = ide_generic;
-
-                               hws[i] = &hw[i];
-                               idx[i] = hwif->index;
-                       }
+                       hws[i] = &hw[i];
                }
 
-               ide_device_add(idx, NULL, hws);
+               ide_host_add(NULL, hws, NULL);
        }
 
        return 0;