diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-05 12:13:59 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-05 12:13:59 +1000 |
| commit | 16b4fd76eff75b94a2644a5021dd02a1626c6e99 (patch) | |
| tree | 63934adb7d75303eeeea1813c14de1474a3962c0 /drivers/ide/ide-pnp.c | |
| parent | a37a60331f7158e717f6d7de8e8d90887afae570 (diff) | |
| parent | 2e024d9e479142c74611ec9b8f8a8e3eb0e3c621 (diff) | |
Merge branch 'quilt/ide'
Diffstat (limited to 'drivers/ide/ide-pnp.c')
| -rw-r--r-- | drivers/ide/ide-pnp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-pnp.c b/drivers/ide/ide-pnp.c index 6a8953f68e9f..fc1e10c9d1cd 100644 --- a/drivers/ide/ide-pnp.c +++ b/drivers/ide/ide-pnp.c @@ -55,13 +55,13 @@ static int idepnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id) memset(&hw, 0, sizeof(hw)); ide_std_init_ports(&hw, base, ctl); hw.irq = pnp_irq(dev, 0); + hw.chipset = ide_generic; hwif = ide_find_port(); if (hwif) { u8 index = hwif->index; u8 idx[4] = { index, 0xff, 0xff, 0xff }; - ide_init_port_data(hwif, index); ide_init_port_hw(hwif, &hw); printk(KERN_INFO "ide%d: generic PnP IDE interface\n", index); |