aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 05:16:48 -0400
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 05:16:48 -0400
commitd629e03b64c469245ceb07d05460e1e2eefa7585 (patch)
treec0bac5206be0875305856a4a9e23631856abfa06 /arch
parentad757b6aa5801b81dec609d87753604a06313c53 (diff)
i386: move mach-default
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/Makefile12
-rw-r--r--arch/x86/mach-default/Makefile (renamed from arch/i386/mach-default/Makefile)0
-rw-r--r--arch/x86/mach-default/setup.c (renamed from arch/i386/mach-default/setup.c)0
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index cbdc14fddc3a..223c5e252ec1 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -61,7 +61,7 @@ AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_signal_frame\n.cfi_endproc,-DCONF
61CFLAGS += $(cflags-y) 61CFLAGS += $(cflags-y)
62 62
63# Default subarch .c files 63# Default subarch .c files
64mcore-y := arch/i386/mach-default 64mcore-y := arch/x86/mach-default
65 65
66# Voyager subarch support 66# Voyager subarch support
67mflags-$(CONFIG_X86_VOYAGER) := -Iinclude/asm-i386/mach-voyager 67mflags-$(CONFIG_X86_VOYAGER) := -Iinclude/asm-i386/mach-voyager
@@ -73,24 +73,24 @@ mcore-$(CONFIG_X86_VISWS) := arch/x86/mach-visws
73 73
74# NUMAQ subarch support 74# NUMAQ subarch support
75mflags-$(CONFIG_X86_NUMAQ) := -Iinclude/asm-i386/mach-numaq 75mflags-$(CONFIG_X86_NUMAQ) := -Iinclude/asm-i386/mach-numaq
76mcore-$(CONFIG_X86_NUMAQ) := arch/i386/mach-default 76mcore-$(CONFIG_X86_NUMAQ) := arch/x86/mach-default
77 77
78# BIGSMP subarch support 78# BIGSMP subarch support
79mflags-$(CONFIG_X86_BIGSMP) := -Iinclude/asm-i386/mach-bigsmp 79mflags-$(CONFIG_X86_BIGSMP) := -Iinclude/asm-i386/mach-bigsmp
80mcore-$(CONFIG_X86_BIGSMP) := arch/i386/mach-default 80mcore-$(CONFIG_X86_BIGSMP) := arch/x86/mach-default
81 81
82#Summit subarch support 82#Summit subarch support
83mflags-$(CONFIG_X86_SUMMIT) := -Iinclude/asm-i386/mach-summit 83mflags-$(CONFIG_X86_SUMMIT) := -Iinclude/asm-i386/mach-summit
84mcore-$(CONFIG_X86_SUMMIT) := arch/i386/mach-default 84mcore-$(CONFIG_X86_SUMMIT) := arch/x86/mach-default
85 85
86# generic subarchitecture 86# generic subarchitecture
87mflags-$(CONFIG_X86_GENERICARCH) := -Iinclude/asm-i386/mach-generic 87mflags-$(CONFIG_X86_GENERICARCH) := -Iinclude/asm-i386/mach-generic
88mcore-$(CONFIG_X86_GENERICARCH) := arch/i386/mach-default 88mcore-$(CONFIG_X86_GENERICARCH) := arch/x86/mach-default
89core-$(CONFIG_X86_GENERICARCH) += arch/x86/mach-generic/ 89core-$(CONFIG_X86_GENERICARCH) += arch/x86/mach-generic/
90 90
91# ES7000 subarch support 91# ES7000 subarch support
92mflags-$(CONFIG_X86_ES7000) := -Iinclude/asm-i386/mach-es7000 92mflags-$(CONFIG_X86_ES7000) := -Iinclude/asm-i386/mach-es7000
93mcore-$(CONFIG_X86_ES7000) := arch/i386/mach-default 93mcore-$(CONFIG_X86_ES7000) := arch/x86/mach-default
94core-$(CONFIG_X86_ES7000) := arch/i386/mach-es7000/ 94core-$(CONFIG_X86_ES7000) := arch/i386/mach-es7000/
95 95
96# Xen paravirtualization support 96# Xen paravirtualization support
diff --git a/arch/i386/mach-default/Makefile b/arch/x86/mach-default/Makefile
index 012fe34459e6..012fe34459e6 100644
--- a/arch/i386/mach-default/Makefile
+++ b/arch/x86/mach-default/Makefile
diff --git a/arch/i386/mach-default/setup.c b/arch/x86/mach-default/setup.c
index 7f635c7a2381..7f635c7a2381 100644
--- a/arch/i386/mach-default/setup.c
+++ b/arch/x86/mach-default/setup.c