From 742e86586f5384982eb840444091b2da771ee998 Mon Sep 17 00:00:00 2001
From: Catalin Marinas <catalin.marinas@arm.com>
Date: Tue, 18 Dec 2012 15:26:13 +0000
Subject: [PATCH] --- yaml --- r: 348251 b: refs/heads/master c:
 25c92a37a8191b5fdbbba7bdc917e14766a52461 h: refs/heads/master i:   348249:
 3c361584f00f542a1a9d5e451e9a4356057f335e   348247:
 5317679a4339d6f2dd9c4d27fc3786598bddb623 v: v3

---
 [refs]                   | 2 +-
 trunk/arch/arm64/Kconfig | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6df6121aff4a..71048cb4c550 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db2789b50068420127475182d5cf4d501547751b
+refs/heads/master: 25c92a37a8191b5fdbbba7bdc917e14766a52461
diff --git a/trunk/arch/arm64/Kconfig b/trunk/arch/arm64/Kconfig
index dcbd4c8fcea9..f8f362aafee9 100644
--- a/trunk/arch/arm64/Kconfig
+++ b/trunk/arch/arm64/Kconfig
@@ -2,6 +2,7 @@ config ARM64
 	def_bool y
 	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 	select ARCH_WANT_COMPAT_IPC_PARSE_VERSION
+	select ARM_AMBA
 	select CLONE_BACKWARDS
 	select COMMON_CLK
 	select GENERIC_CLOCKEVENTS
@@ -90,6 +91,9 @@ config SWIOTLB
 config IOMMU_HELPER
 	def_bool SWIOTLB
 
+config GENERIC_GPIO
+	def_bool y
+
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"