tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

i386: move mach-default

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Thomas Gleixner d629e03b ad757b6a

+6 -6
+6 -6
arch/i386/Makefile
··· 61 61 CFLAGS += $(cflags-y) 62 62 63 63 # Default subarch .c files 64 - mcore-y := arch/i386/mach-default 64 + mcore-y := arch/x86/mach-default 65 65 66 66 # Voyager subarch support 67 67 mflags-$(CONFIG_X86_VOYAGER) := -Iinclude/asm-i386/mach-voyager ··· 73 73 74 74 # NUMAQ subarch support 75 75 mflags-$(CONFIG_X86_NUMAQ) := -Iinclude/asm-i386/mach-numaq 76 - mcore-$(CONFIG_X86_NUMAQ) := arch/i386/mach-default 76 + mcore-$(CONFIG_X86_NUMAQ) := arch/x86/mach-default 77 77 78 78 # BIGSMP subarch support 79 79 mflags-$(CONFIG_X86_BIGSMP) := -Iinclude/asm-i386/mach-bigsmp 80 - mcore-$(CONFIG_X86_BIGSMP) := arch/i386/mach-default 80 + mcore-$(CONFIG_X86_BIGSMP) := arch/x86/mach-default 81 81 82 82 #Summit subarch support 83 83 mflags-$(CONFIG_X86_SUMMIT) := -Iinclude/asm-i386/mach-summit 84 - mcore-$(CONFIG_X86_SUMMIT) := arch/i386/mach-default 84 + mcore-$(CONFIG_X86_SUMMIT) := arch/x86/mach-default 85 85 86 86 # generic subarchitecture 87 87 mflags-$(CONFIG_X86_GENERICARCH) := -Iinclude/asm-i386/mach-generic 88 - mcore-$(CONFIG_X86_GENERICARCH) := arch/i386/mach-default 88 + mcore-$(CONFIG_X86_GENERICARCH) := arch/x86/mach-default 89 89 core-$(CONFIG_X86_GENERICARCH) += arch/x86/mach-generic/ 90 90 91 91 # ES7000 subarch support 92 92 mflags-$(CONFIG_X86_ES7000) := -Iinclude/asm-i386/mach-es7000 93 - mcore-$(CONFIG_X86_ES7000) := arch/i386/mach-default 93 + mcore-$(CONFIG_X86_ES7000) := arch/x86/mach-default 94 94 core-$(CONFIG_X86_ES7000) := arch/i386/mach-es7000/ 95 95 96 96 # Xen paravirtualization support
arch/i386/mach-default/Makefile arch/x86/mach-default/Makefile
arch/i386/mach-default/setup.c arch/x86/mach-default/setup.c