Merge branch 'work'

[linux-2.6-omap-h63xx.git] / drivers / ide / Kconfig

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index a737886e39d172caa2100be75494f6f024f7de9c..1c81174595b3ce12db4ee9d8194d29b61d92c67b 100644 (file)
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -539,6 +539,15 @@ config BLK_DEV_CS5530
 
          It is safe to say Y to this question.
 
 
          It is safe to say Y to this question.
 

+config BLK_DEV_CS5535
+       tristate "AMD CS5535 chipset support"
+       depends on X86 && !X86_64
+       help
+         Include support for UDMA on the NSC/AMD CS5535 companion chipset.
+         This will automatically be detected and configured if found.
+
+         It is safe to say Y to this question.
+

 config BLK_DEV_HPT34X
        tristate "HPT34X chipset support"
        help
 config BLK_DEV_HPT34X
        tristate "HPT34X chipset support"
        help


@@ -616,7 +625,7 @@ config BLK_DEV_NS87415
        tristate "NS87415 chipset support"
        help
          This driver adds detection and support for the NS87415 chip
        tristate "NS87415 chipset support"
        help
          This driver adds detection and support for the NS87415 chip

-         (used in SPARC64, among others).
+         (used mainly on SPARC64 and PA-RISC machines).

 
          Please read the comments at the top of <file:drivers/ide/pci/ns87415.c>.
 
 
          Please read the comments at the top of <file:drivers/ide/pci/ns87415.c>.
 


@@ -778,6 +787,10 @@ config BLK_DEV_IDE_PMAC_BLINK
          This option enables the use of the sleep LED as a hard drive
          activity LED.
 
          This option enables the use of the sleep LED as a hard drive
          activity LED.
 

+config BLK_DEV_IDE_SWARM
+       tristate "IDE for Sibyte evaluation boards"
+       depends on SIBYTE_SB1xxx_SOC
+

 config BLK_DEV_IDE_AU1XXX
        bool "IDE for AMD Alchemy Au1200"
        depends on SOC_AU1200
 config BLK_DEV_IDE_AU1XXX
        bool "IDE for AMD Alchemy Au1200"
        depends on SOC_AU1200


@@ -794,14 +807,6 @@ config BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
        depends on SOC_AU1200 && BLK_DEV_IDE_AU1XXX
 endchoice
 
        depends on SOC_AU1200 && BLK_DEV_IDE_AU1XXX
 endchoice
 

-config BLK_DEV_IDE_AU1XXX_BURSTABLE_ON
-        bool "Enable burstable Mode on DbDMA"
-        default false
-        depends BLK_DEV_IDE_AU1XXX
-        help
-          This option enable the burstable Flag on DbDMA controller
-          (cf. "AMD Alchemy 'Au1200' Processor Data Book - PRELIMINARY").
-

 config BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ
        int "Maximum transfer size (KB) per request (up to 128)"
        default "128"
 config BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ
        int "Maximum transfer size (KB) per request (up to 128)"
        default "128"


@@ -927,7 +932,7 @@ config BLK_DEV_Q40IDE
 
 config BLK_DEV_MPC8xx_IDE
        bool "MPC8xx IDE support"
 
 config BLK_DEV_MPC8xx_IDE
        bool "MPC8xx IDE support"

-       depends on 8xx
+       depends on 8xx && IDE=y && BLK_DEV_IDE=y

        help
          This option provides support for IDE on Motorola MPC8xx Systems.
          Please see 'Type of MPC8xx IDE interface' for details.
        help
          This option provides support for IDE on Motorola MPC8xx Systems.
          Please see 'Type of MPC8xx IDE interface' for details.