diff options
| author | Wim Van Sebroeck <wim@iguana.be> | 2007-05-11 21:03:13 +0200 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2007-05-11 21:03:13 +0200 |
| commit | 5c34202b8bf942da411b6599668a76b07449bbfd (patch) | |
| tree | 5719c361321eaddc8e4f1b0c8a7994f0e9a6fdd3 /drivers/ide/ide-pnp.c | |
| parent | [WATCHDOG] iTCO_wdt.c - fix ACPI Base register (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial (diff) | |
| download | linux-5c34202b8bf942da411b6599668a76b07449bbfd.tar.xz linux-5c34202b8bf942da411b6599668a76b07449bbfd.zip | |
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
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 98410ca044cf..2b8009c50e91 100644 --- a/drivers/ide/ide-pnp.c +++ b/drivers/ide/ide-pnp.c @@ -42,7 +42,7 @@ static int idepnp_probe(struct pnp_dev * dev, const struct pnp_device_id *dev_id hw.irq = pnp_irq(dev, 0); hw.dma = NO_DMA; - index = ide_register_hw(&hw, &hwif); + index = ide_register_hw(&hw, 1, &hwif); if (index != -1) { printk(KERN_INFO "ide%d: generic PnP IDE interface\n", index); |