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/macintosh | |
| 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/macintosh')
| -rw-r--r-- | drivers/macintosh/mediabay.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c index 0acf2f7fd9d7..c803d2bba65d 100644 --- a/drivers/macintosh/mediabay.c +++ b/drivers/macintosh/mediabay.c | |||
| @@ -563,7 +563,7 @@ static void media_bay_step(int i) | |||
| 563 | ide_init_hwif_ports(&hw, (unsigned long) bay->cd_base, (unsigned long) 0, NULL); | 563 | ide_init_hwif_ports(&hw, (unsigned long) bay->cd_base, (unsigned long) 0, NULL); |
| 564 | hw.irq = bay->cd_irq; | 564 | hw.irq = bay->cd_irq; |
| 565 | hw.chipset = ide_pmac; | 565 | hw.chipset = ide_pmac; |
| 566 | bay->cd_index = ide_register_hw(&hw, NULL); | 566 | bay->cd_index = ide_register_hw(&hw, 0, NULL); |
| 567 | pmu_resume(); | 567 | pmu_resume(); |
| 568 | } | 568 | } |
| 569 | if (bay->cd_index == -1) { | 569 | if (bay->cd_index == -1) { |