From e3b2a585080f6f00765588e5085b118923d6b43c Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Thu, 25 Oct 2007 21:04:16 +0200
Subject: [PATCH] --- yaml --- r: 72632 b: refs/heads/master c:
 47572387d58a9584c60ebbbdee56fc92c627f16f h: refs/heads/master v: v3

---
 [refs]                                            | 2 +-
 trunk/arch/{i386 => x86}/Kconfig.cpu              | 0
 trunk/arch/{i386/Kconfig => x86/Kconfig.i386}     | 2 +-
 trunk/arch/{x86_64/Kconfig => x86/Kconfig.x86_64} | 0
 trunk/scripts/kconfig/Makefile                    | 7 ++++++-
 5 files changed, 8 insertions(+), 3 deletions(-)
 rename trunk/arch/{i386 => x86}/Kconfig.cpu (100%)
 rename trunk/arch/{i386/Kconfig => x86/Kconfig.i386} (99%)
 rename trunk/arch/{x86_64/Kconfig => x86/Kconfig.x86_64} (100%)

diff --git a/[refs] b/[refs]
index 796281f20323..4e51b6a12fb1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e703f75d620824739148142c3734ae8223e4d1f5
+refs/heads/master: 47572387d58a9584c60ebbbdee56fc92c627f16f
diff --git a/trunk/arch/i386/Kconfig.cpu b/trunk/arch/x86/Kconfig.cpu
similarity index 100%
rename from trunk/arch/i386/Kconfig.cpu
rename to trunk/arch/x86/Kconfig.cpu
diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/x86/Kconfig.i386
similarity index 99%
rename from trunk/arch/i386/Kconfig
rename to trunk/arch/x86/Kconfig.i386
index d24e3e207ea5..7331efe891a7 100644
--- a/trunk/arch/i386/Kconfig
+++ b/trunk/arch/x86/Kconfig.i386
@@ -287,7 +287,7 @@ config ES7000_CLUSTERED_APIC
 	default y
 	depends on SMP && X86_ES7000 && MPENTIUMIII
 
-source "arch/i386/Kconfig.cpu"
+source "arch/x86/Kconfig.cpu"
 
 config HPET_TIMER
 	bool "HPET Timer Support"
diff --git a/trunk/arch/x86_64/Kconfig b/trunk/arch/x86/Kconfig.x86_64
similarity index 100%
rename from trunk/arch/x86_64/Kconfig
rename to trunk/arch/x86/Kconfig.x86_64
diff --git a/trunk/scripts/kconfig/Makefile b/trunk/scripts/kconfig/Makefile
index 3c9db073571c..59594126e8b6 100644
--- a/trunk/scripts/kconfig/Makefile
+++ b/trunk/scripts/kconfig/Makefile
@@ -4,7 +4,12 @@
 
 PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config
 
-Kconfig := arch/$(ARCH)/Kconfig
+# If a arch/$(SRCARCH)/Kconfig.$(ARCH) file exist use it
+ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/Kconfig.$(ARCH)),)
+        Kconfig := arch/$(SRCARCH)/Kconfig.$(ARCH)
+else
+        Kconfig := arch/$(SRCARCH)/Kconfig
+endif
 
 xconfig: $(obj)/qconf
 	$< $(Kconfig)