diff options
| -rw-r--r-- | arch/x86/Kconfig.cpu (renamed from arch/i386/Kconfig.cpu) | 0 | ||||
| -rw-r--r-- | arch/x86/Kconfig.i386 (renamed from arch/i386/Kconfig) | 2 | ||||
| -rw-r--r-- | arch/x86/Kconfig.x86_64 (renamed from arch/x86_64/Kconfig) | 0 | ||||
| -rw-r--r-- | scripts/kconfig/Makefile | 7 |
4 files changed, 7 insertions, 2 deletions
diff --git a/arch/i386/Kconfig.cpu b/arch/x86/Kconfig.cpu index 0e2adadf5905..0e2adadf5905 100644 --- a/arch/i386/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu diff --git a/arch/i386/Kconfig b/arch/x86/Kconfig.i386 index d24e3e207ea5..7331efe891a7 100644 --- a/arch/i386/Kconfig +++ b/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/arch/x86_64/Kconfig b/arch/x86/Kconfig.x86_64 index e2542e5b536c..e2542e5b536c 100644 --- a/arch/x86_64/Kconfig +++ b/arch/x86/Kconfig.x86_64 diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 3c9db073571c..59594126e8b6 100644 --- a/scripts/kconfig/Makefile +++ b/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) |