Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

[cascardo/linux.git] / drivers / ata / Kconfig

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 7671dba..e1b9278 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -16,6 +16,7 @@ menuconfig ATA
        depends on BLOCK
        depends on !(M32R || M68K || S390) || BROKEN
        select SCSI
+       select GLOB
        ---help---
          If you want to use an ATA hard disk, ATA tape drive, ATA CD-ROM or
          any other ATA device under Linux, say Y and make sure that you know
@@ -141,6 +142,15 @@ config AHCI_SUNXI
 
          If unsure, say N.
 
+config AHCI_TEGRA
+       tristate "NVIDIA Tegra124 AHCI SATA support"
+       depends on ARCH_TEGRA
+       help
+         This option enables support for the NVIDIA Tegra124 SoC's
+         onboard AHCI SATA.
+
+         If unsure, say N.
+
 config AHCI_XGENE
        tristate "APM X-Gene 6.0Gbps AHCI SATA host controller support"
        depends on PHY_XGENE