---

yaml --- r: 72632 b: refs/heads/master c: 4757238 h: refs/heads/master v: v3
git-mirror · Oct 25, 2007 · e3b2a58 · e3b2a58
1 parent 3ba2a5e
commit e3b2a58
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e703f75d620824739148142c3734ae8223e4d1f5
+refs/heads/master: 47572387d58a9584c60ebbbdee56fc92c627f16f
diff --git a/trunk/arch/i386/Kconfig.cpu → trunk/arch/x86/Kconfig.cpu b/trunk/arch/i386/Kconfig.cpu → trunk/arch/x86/Kconfig.cpu
diff --git a/trunk/arch/i386/Kconfig → trunk/arch/x86/Kconfig.i386 b/trunk/arch/i386/Kconfig → 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 → trunk/arch/x86/Kconfig.x86_64 b/trunk/arch/x86_64/Kconfig → trunk/arch/x86/Kconfig.x86_64
diff --git 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)