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

[linux-2.6] / drivers / ide / legacy / ht6560b.c

diff --git a/drivers/ide/legacy/ht6560b.c b/drivers/ide/legacy/ht6560b.c
index 314e6c6aeb6c2f1dbe790629f4a54a6d241e6731..88fe9070c9c30668878ac79eb75853ab4cbe0392 100644 (file)
--- a/drivers/ide/legacy/ht6560b.c
+++ b/drivers/ide/legacy/ht6560b.c
@@ -340,6 +340,7 @@ static int __init ht6560b_init(void)
 {
        ide_hwif_t *hwif, *mate;
        static u8 idx[4] = { 0, 1, 0xff, 0xff };
+       hw_regs_t hw[2];
 
        if (probe_ht6560b == 0)
                return -ENODEV;
@@ -358,6 +359,17 @@ static int __init ht6560b_init(void)
                goto release_region;
        }
 
+       memset(&hw, 0, sizeof(hw));
+
+       ide_std_init_ports(&hw[0], 0x1f0, 0x3f6);
+       hw[0].irq = 14;
+
+       ide_std_init_ports(&hw[1], 0x170, 0x376);
+       hw[1].irq = 15;
+
+       ide_init_port_hw(hwif, &hw[0]);
+       ide_init_port_hw(mate, &hw[1]);
+
        hwif->selectproc = &ht6560b_selectproc;
        hwif->set_pio_mode = &ht6560b_set_pio_mode;