Clean up drivers/ata/Kconfig a bit.

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 2109d755c14d659409f7a8a4a4d32633f55ce27f..13027d56b7f639e5bc9a4b3d06a5379ad700e649 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -3,11 +3,10 @@
 #
 
 menu "Serial ATA (prod) and Parallel ATA (experimental) drivers"
 #
 
 menu "Serial ATA (prod) and Parallel ATA (experimental) drivers"

-       depends on SCSI

 
 config ATA
        tristate "ATA device support"
 
 config ATA
        tristate "ATA device support"

-       depends on SCSI
+       select SCSI

        ---help---
          If you want to use a ATA hard disk, ATA tape drive, ATA CD-ROM or
          any other ATA device under Linux, say Y and make sure that you know
        ---help---
          If you want to use a ATA hard disk, ATA tape drive, ATA CD-ROM or
          any other ATA device under Linux, say Y and make sure that you know


@@ -15,9 +14,11 @@ config ATA
          that "speaks" the ATA protocol, also called ATA controller),
          because you will be asked for it.
 
          that "speaks" the ATA protocol, also called ATA controller),
          because you will be asked for it.
 

+if ATA
+

 config SATA_AHCI
        tristate "AHCI SATA support"
 config SATA_AHCI
        tristate "AHCI SATA support"

-       depends on ATA && PCI
+       depends on PCI

        help
          This option enables support for AHCI Serial ATA.
 
        help
          This option enables support for AHCI Serial ATA.
 


@@ -25,7 +26,7 @@ config SATA_AHCI
 
 config SATA_SVW
        tristate "ServerWorks Frodo / Apple K2 SATA support"
 
 config SATA_SVW
        tristate "ServerWorks Frodo / Apple K2 SATA support"

-       depends on ATA && PCI
+       depends on PCI

        help
          This option enables support for Broadcom/Serverworks/Apple K2
          SATA support.
        help
          This option enables support for Broadcom/Serverworks/Apple K2
          SATA support.


@@ -34,7 +35,7 @@ config SATA_SVW
 
 config ATA_PIIX
        tristate "Intel PIIX/ICH SATA support"
 
 config ATA_PIIX
        tristate "Intel PIIX/ICH SATA support"

-       depends on ATA && PCI
+       depends on PCI

        help
          This option enables support for ICH5/6/7/8 Serial ATA.
          If PATA support was enabled previously, this enables
        help
          This option enables support for ICH5/6/7/8 Serial ATA.
          If PATA support was enabled previously, this enables


@@ -44,7 +45,7 @@ config ATA_PIIX
 
 config SATA_MV
        tristate "Marvell SATA support (HIGHLY EXPERIMENTAL)"
 
 config SATA_MV
        tristate "Marvell SATA support (HIGHLY EXPERIMENTAL)"

-       depends on ATA && PCI && EXPERIMENTAL
+       depends on PCI && EXPERIMENTAL

        help
          This option enables support for the Marvell Serial ATA family.
          Currently supports 88SX[56]0[48][01] chips.
        help
          This option enables support for the Marvell Serial ATA family.
          Currently supports 88SX[56]0[48][01] chips.


@@ -53,7 +54,7 @@ config SATA_MV
 
 config SATA_NV
        tristate "NVIDIA SATA support"
 
 config SATA_NV
        tristate "NVIDIA SATA support"

-       depends on ATA && PCI
+       depends on PCI

        help
          This option enables support for NVIDIA Serial ATA.
 
        help
          This option enables support for NVIDIA Serial ATA.
 


@@ -61,7 +62,7 @@ config SATA_NV
 
 config PDC_ADMA
        tristate "Pacific Digital ADMA support"
 
 config PDC_ADMA
        tristate "Pacific Digital ADMA support"

-       depends on ATA && PCI
+       depends on PCI

        help
          This option enables support for Pacific Digital ADMA controllers
 
        help
          This option enables support for Pacific Digital ADMA controllers
 


@@ -69,7 +70,7 @@ config PDC_ADMA
 
 config SATA_QSTOR
        tristate "Pacific Digital SATA QStor support"
 
 config SATA_QSTOR
        tristate "Pacific Digital SATA QStor support"

-       depends on ATA && PCI
+       depends on PCI

        help
          This option enables support for Pacific Digital Serial ATA QStor.
 
        help
          This option enables support for Pacific Digital Serial ATA QStor.
 


@@ -77,7 +78,7 @@ config SATA_QSTOR
 
 config SATA_PROMISE
        tristate "Promise SATA TX2/TX4 support"
 
 config SATA_PROMISE
        tristate "Promise SATA TX2/TX4 support"

-       depends on ATA && PCI
+       depends on PCI

        help
          This option enables support for Promise Serial ATA TX2/TX4.
 
        help
          This option enables support for Promise Serial ATA TX2/TX4.
 


@@ -85,7 +86,7 @@ config SATA_PROMISE
 
 config SATA_SX4
        tristate "Promise SATA SX4 support"
 
 config SATA_SX4
        tristate "Promise SATA SX4 support"

-       depends on ATA && PCI && EXPERIMENTAL
+       depends on PCI && EXPERIMENTAL

        help
          This option enables support for Promise Serial ATA SX4.
 
        help
          This option enables support for Promise Serial ATA SX4.
 


@@ -93,7 +94,7 @@ config SATA_SX4
 
 config SATA_SIL
        tristate "Silicon Image SATA support"
 
 config SATA_SIL
        tristate "Silicon Image SATA support"

-       depends on ATA && PCI
+       depends on PCI

        help
          This option enables support for Silicon Image Serial ATA.
 
        help
          This option enables support for Silicon Image Serial ATA.
 


@@ -101,7 +102,7 @@ config SATA_SIL
 
 config SATA_SIL24
        tristate "Silicon Image 3124/3132 SATA support"
 
 config SATA_SIL24
        tristate "Silicon Image 3124/3132 SATA support"

-       depends on ATA && PCI
+       depends on PCI

        help
          This option enables support for Silicon Image 3124/3132 Serial ATA.
 
        help
          This option enables support for Silicon Image 3124/3132 Serial ATA.
 


@@ -109,7 +110,7 @@ config SATA_SIL24
 
 config SATA_SIS
        tristate "SiS 964/180 SATA support"
 
 config SATA_SIS
        tristate "SiS 964/180 SATA support"

-       depends on ATA && PCI
+       depends on PCI

        help
          This option enables support for SiS Serial ATA 964/180.
 
        help
          This option enables support for SiS Serial ATA 964/180.
 


@@ -117,7 +118,7 @@ config SATA_SIS
 
 config SATA_ULI
        tristate "ULi Electronics SATA support"
 
 config SATA_ULI
        tristate "ULi Electronics SATA support"

-       depends on ATA && PCI
+       depends on PCI

        help
          This option enables support for ULi Electronics SATA.
 
        help
          This option enables support for ULi Electronics SATA.
 


@@ -125,7 +126,7 @@ config SATA_ULI
 
 config SATA_VIA
        tristate "VIA SATA support"
 
 config SATA_VIA
        tristate "VIA SATA support"

-       depends on ATA && PCI
+       depends on PCI

        help
          This option enables support for VIA Serial ATA.
 
        help
          This option enables support for VIA Serial ATA.
 


@@ -133,7 +134,7 @@ config SATA_VIA
 
 config SATA_VITESSE
        tristate "VITESSE VSC-7174 / INTEL 31244 SATA support"
 
 config SATA_VITESSE
        tristate "VITESSE VSC-7174 / INTEL 31244 SATA support"

-       depends on ATA && PCI
+       depends on PCI

        help
          This option enables support for Vitesse VSC7174 and Intel 31244 Serial ATA.
 
        help
          This option enables support for Vitesse VSC7174 and Intel 31244 Serial ATA.
 


@@ -144,5 +145,6 @@ config SATA_INTEL_COMBINED
        depends on IDE=y && !BLK_DEV_IDE_SATA && (SATA_AHCI || ATA_PIIX)
        default y
 
        depends on IDE=y && !BLK_DEV_IDE_SATA && (SATA_AHCI || ATA_PIIX)
        default y
 

+endif

 endmenu
 
 endmenu