diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-03 02:55:27 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-03 02:55:27 -0500 |
| commit | fb53fde9762432d091dac209bdf4f3f850117c55 (patch) | |
| tree | 607b09022b206a539cb4a924e4ef476443798252 /drivers/ide/Kconfig | |
| parent | eb4400e3a040b90a3ad805b01fcbc99a5f615c8f (diff) | |
| parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/ide/Kconfig')
| -rw-r--r-- | drivers/ide/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index b1c6f68d98ce..3dad2299d9c5 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig | |||
| @@ -465,6 +465,16 @@ config BLK_DEV_CS5535 | |||
| 465 | 465 | ||
| 466 | It is safe to say Y to this question. | 466 | It is safe to say Y to this question. |
| 467 | 467 | ||
| 468 | config BLK_DEV_CS5536 | ||
| 469 | tristate "CS5536 chipset support" | ||
| 470 | depends on X86_32 | ||
| 471 | select BLK_DEV_IDEDMA_PCI | ||
| 472 | help | ||
| 473 | This option enables support for the AMD CS5536 | ||
| 474 | companion chip used with the Geode LX processor family. | ||
| 475 | |||
| 476 | If unsure, say N. | ||
| 477 | |||
| 468 | config BLK_DEV_HPT366 | 478 | config BLK_DEV_HPT366 |
| 469 | tristate "HPT36X/37X chipset support" | 479 | tristate "HPT36X/37X chipset support" |
| 470 | select BLK_DEV_IDEDMA_PCI | 480 | select BLK_DEV_IDEDMA_PCI |