diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-18 18:16:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-18 18:16:12 -0400 |
| commit | 91aa9fb573fcc50bc74d5ee64c7e9b36131f1804 (patch) | |
| tree | afa2160e4b611f2991c09a6d6dc6079e47105605 /drivers/ide/Kconfig | |
| parent | 5fdf193b15a08f6c32ca4eb5913fa9be788e790e (diff) | |
| parent | 84f57fbc724e3b56dc87c37dddac89f82cf75ef6 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
Diffstat (limited to 'drivers/ide/Kconfig')
| -rw-r--r-- | drivers/ide/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index 5f33df47aa74..1cadd2c3cadd 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig | |||
| @@ -764,6 +764,7 @@ config BLK_DEV_IDE_PMAC_ATA100FIRST | |||
| 764 | config BLK_DEV_IDEDMA_PMAC | 764 | config BLK_DEV_IDEDMA_PMAC |
| 765 | bool "PowerMac IDE DMA support" | 765 | bool "PowerMac IDE DMA support" |
| 766 | depends on BLK_DEV_IDE_PMAC | 766 | depends on BLK_DEV_IDE_PMAC |
| 767 | select BLK_DEV_IDEDMA_PCI | ||
| 767 | help | 768 | help |
| 768 | This option allows the driver for the built-in IDE controller on | 769 | This option allows the driver for the built-in IDE controller on |
| 769 | Power Macintoshes and PowerBooks to use DMA (direct memory access) | 770 | Power Macintoshes and PowerBooks to use DMA (direct memory access) |