diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-21 01:48:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-21 01:48:42 -0400 |
| commit | 38f061c5714265fa8481cc0b7795aa8fe81b45be (patch) | |
| tree | e145112bc2ddcbd1fdd8c7d582603f253e0ef3f4 /arch | |
| parent | 09d4b9aa90ab7a0ce7c266d2ea18153bf79bba33 (diff) | |
| parent | b0244a00451c1ad64bf0a51f50679f7146786780 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
ide-disk: workaround for buggy HPA support on ST340823A (take 3)
hpt34x: fix CONFIG_HPT34X_AUTODMA=n handling
triflex: add missing ->dma_base check
pdc202xx_old: add missing ->dma_base check
pdc202xx_new: add missing ->dma_base check
cs5530: add missing ->dma_base check
ide: ide_config_drive_speed() bugfixes
ide: add cable detection for early UDMA66 devices (take 3)
ide-pmac: fix drive->init_speed reporting
ide: config_drive_for_dma() fixes
ide-cris: fix ->set_pio_mode method to set transfer mode on the device
ide: fix hidden dependencies on CONFIG_IDE_GENERIC
ide: make CONFIG_IDE_GENERIC default to N
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/cris/arch-v10/drivers/Kconfig | 1 | ||||
| -rw-r--r-- | arch/cris/arch-v32/drivers/Kconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/cris/arch-v10/drivers/Kconfig b/arch/cris/arch-v10/drivers/Kconfig index e7e724bc0ba6..03e2e68f947d 100644 --- a/arch/cris/arch-v10/drivers/Kconfig +++ b/arch/cris/arch-v10/drivers/Kconfig | |||
| @@ -548,6 +548,7 @@ config ETRAX_IDE | |||
| 548 | select BLK_DEV_IDEDISK | 548 | select BLK_DEV_IDEDISK |
| 549 | select BLK_DEV_IDECD | 549 | select BLK_DEV_IDECD |
| 550 | select BLK_DEV_IDEDMA | 550 | select BLK_DEV_IDEDMA |
| 551 | select IDE_GENERIC | ||
| 551 | help | 552 | help |
| 552 | Enable this to get support for ATA/IDE. | 553 | Enable this to get support for ATA/IDE. |
| 553 | You can't use parallel ports or SCSI ports | 554 | You can't use parallel ports or SCSI ports |
diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig index 1d859c16931e..cc6ba5423754 100644 --- a/arch/cris/arch-v32/drivers/Kconfig +++ b/arch/cris/arch-v32/drivers/Kconfig | |||
| @@ -592,6 +592,7 @@ config ETRAX_IDE | |||
| 592 | select BLK_DEV_IDEDISK | 592 | select BLK_DEV_IDEDISK |
| 593 | select BLK_DEV_IDECD | 593 | select BLK_DEV_IDECD |
| 594 | select BLK_DEV_IDEDMA | 594 | select BLK_DEV_IDEDMA |
| 595 | select IDE_GENERIC | ||
| 595 | help | 596 | help |
| 596 | Enables the ETRAX IDE driver. | 597 | Enables the ETRAX IDE driver. |
| 597 | 598 | ||