diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 18:41:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 18:41:31 -0400 |
| commit | 3cb7396b7b26585b1ab7c1a8ca554ec103da5d37 (patch) | |
| tree | 94720199f016045fe2a204ac8fd26c0029f4544c /drivers/ide/ide-pnp.c | |
| parent | d0b6e0e380d6a32d479120a8b5d98cdff936ec8c (diff) | |
| parent | 317a46a200e6514a1acf50ed30291160185a5c73 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
ide: fix PIO setup on resume for ATAPI devices
ide: legacy PCI bus order probing fixes
ide: add ide_proc_register_port()
ide: add "initializing" argument to ide_register_hw()
ide: cable detection fixes (take 2)
ide: move IDE settings handling to ide-proc.c
ide: split off ioctl handling from IDE settings (v2)
ide: make /proc/ide/ optional
ide: add ide_tune_dma() helper
ide: rework the code for selecting the best DMA transfer mode (v3)
ide: fix UDMA/MWDMA/SWDMA masks (v3)
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 | |||
| 42 | hw.irq = pnp_irq(dev, 0); | 42 | hw.irq = pnp_irq(dev, 0); |
| 43 | hw.dma = NO_DMA; | 43 | hw.dma = NO_DMA; |
| 44 | 44 | ||
| 45 | index = ide_register_hw(&hw, &hwif); | 45 | index = ide_register_hw(&hw, 1, &hwif); |
| 46 | 46 | ||
| 47 | if (index != -1) { | 47 | if (index != -1) { |
| 48 | printk(KERN_INFO "ide%d: generic PnP IDE interface\n", index); | 48 | printk(KERN_INFO "ide%d: generic PnP IDE interface\n", index); |