3 files changed, 15 insertions, 8 deletions

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 095399618ca5..d0be9a1ef6b8 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -2,6 +2,7 @@ menuconfig ARCH_TEGRA
         bool "NVIDIA Tegra" if ARCH_MULTI_V7
         select ARCH_REQUIRE_GPIOLIB
         select ARCH_SUPPORTS_TRUSTED_FOUNDATIONS
+        select ARM_AMBA
         select ARM_GIC
         select CLKSRC_MMIO
         select HAVE_ARM_SCU if SMP
@@ -59,12 +60,4 @@ config ARCH_TEGRA_124_SOC
           Support for NVIDIA Tegra T124 processor family, based on the
           ARM CortexA15MP CPU
 
-config TEGRA_AHB
-        bool "Enable AHB driver for NVIDIA Tegra SoCs"
-        default y
-        help
-          Adds AHB configuration functionality for NVIDIA Tegra SoCs,
-          which controls AHB bus master arbitration and some
-          performance parameters(priority, prefech size).
-
 endif
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 1a693d3f9d51..af02a8a8ec4a 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -1,5 +1,7 @@
 menu "Device Drivers"
 
+source "drivers/amba/Kconfig"
+
 source "drivers/base/Kconfig"
 
 source "drivers/bus/Kconfig"
diff --git a/drivers/amba/Kconfig b/drivers/amba/Kconfig
index d1cba6a9b3b8..4a5c9d279059 100644
--- a/drivers/amba/Kconfig
+++ b/drivers/amba/Kconfig
@@ -1,2 +1,14 @@
 config ARM_AMBA
         bool
+
+if ARM_AMBA
+
+config TEGRA_AHB
+        bool "Enable AHB driver for NVIDIA Tegra SoCs"
+        default y if ARCH_TEGRA
+        help
+          Adds AHB configuration functionality for NVIDIA Tegra SoCs,
+          which controls AHB bus master arbitration and some performance
+          parameters (priority, prefetch size).
+
+endif