diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-04-24 17:26:50 +0200 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-24 17:26:50 +0200 |
| commit | 36d99df2fb474222ab47fbe8ae7385661033223b (patch) | |
| tree | 962e068491b752a944f61c454fad3f8619a1ea3f /drivers/ide/legacy/ali14xx.c | |
| parent | [CIFS] Fix UNC path prefix on QueryUnixPathInfo to have correct slash (diff) | |
| parent | slab_err: Pass parameters correctly to slab_bug (diff) | |
| download | linux-36d99df2fb474222ab47fbe8ae7385661033223b.tar.xz linux-36d99df2fb474222ab47fbe8ae7385661033223b.zip | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/ide/legacy/ali14xx.c')
| -rw-r--r-- | drivers/ide/legacy/ali14xx.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/ide/legacy/ali14xx.c b/drivers/ide/legacy/ali14xx.c index d4d1a6bea599..bc8b1f8de614 100644 --- a/drivers/ide/legacy/ali14xx.c +++ b/drivers/ide/legacy/ali14xx.c @@ -200,6 +200,7 @@ static const struct ide_port_info ali14xx_port_info = { static int __init ali14xx_probe(void) { static u8 idx[4] = { 0, 1, 0xff, 0xff }; + hw_regs_t hw[2]; printk(KERN_DEBUG "ali14xx: base=0x%03x, regOn=0x%02x.\n", basePort, regOn); @@ -210,6 +211,17 @@ static int __init ali14xx_probe(void) return 1; } + 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(&ide_hwifs[0], &hw[0]); + ide_init_port_hw(&ide_hwifs[1], &hw[1]); + ide_hwifs[0].set_pio_mode = &ali14xx_set_pio_mode; ide_hwifs[1].set_pio_mode = &ali14xx_set_pio_mode; |