diff options
Diffstat (limited to 'arch/i386/Makefile')
-rw-r--r-- | arch/i386/Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/i386/Makefile b/arch/i386/Makefile index 9c1da722964d..b433dae1ac7d 100644 --- a/arch/i386/Makefile +++ b/arch/i386/Makefile | |||
@@ -71,32 +71,32 @@ CFLAGS += $(cflags-y) | |||
71 | mcore-y := arch/x86/mach-default | 71 | mcore-y := arch/x86/mach-default |
72 | 72 | ||
73 | # Voyager subarch support | 73 | # Voyager subarch support |
74 | mflags-$(CONFIG_X86_VOYAGER) := -Iinclude/asm-i386/mach-voyager | 74 | mflags-$(CONFIG_X86_VOYAGER) := -Iinclude/asm-x86/mach-voyager |
75 | mcore-$(CONFIG_X86_VOYAGER) := arch/x86/mach-voyager | 75 | mcore-$(CONFIG_X86_VOYAGER) := arch/x86/mach-voyager |
76 | 76 | ||
77 | # VISWS subarch support | 77 | # VISWS subarch support |
78 | mflags-$(CONFIG_X86_VISWS) := -Iinclude/asm-i386/mach-visws | 78 | mflags-$(CONFIG_X86_VISWS) := -Iinclude/asm-x86/mach-visws |
79 | mcore-$(CONFIG_X86_VISWS) := arch/x86/mach-visws | 79 | mcore-$(CONFIG_X86_VISWS) := arch/x86/mach-visws |
80 | 80 | ||
81 | # NUMAQ subarch support | 81 | # NUMAQ subarch support |
82 | mflags-$(CONFIG_X86_NUMAQ) := -Iinclude/asm-i386/mach-numaq | 82 | mflags-$(CONFIG_X86_NUMAQ) := -Iinclude/asm-x86/mach-numaq |
83 | mcore-$(CONFIG_X86_NUMAQ) := arch/x86/mach-default | 83 | mcore-$(CONFIG_X86_NUMAQ) := arch/x86/mach-default |
84 | 84 | ||
85 | # BIGSMP subarch support | 85 | # BIGSMP subarch support |
86 | mflags-$(CONFIG_X86_BIGSMP) := -Iinclude/asm-i386/mach-bigsmp | 86 | mflags-$(CONFIG_X86_BIGSMP) := -Iinclude/asm-x86/mach-bigsmp |
87 | mcore-$(CONFIG_X86_BIGSMP) := arch/x86/mach-default | 87 | mcore-$(CONFIG_X86_BIGSMP) := arch/x86/mach-default |
88 | 88 | ||
89 | #Summit subarch support | 89 | #Summit subarch support |
90 | mflags-$(CONFIG_X86_SUMMIT) := -Iinclude/asm-i386/mach-summit | 90 | mflags-$(CONFIG_X86_SUMMIT) := -Iinclude/asm-x86/mach-summit |
91 | mcore-$(CONFIG_X86_SUMMIT) := arch/x86/mach-default | 91 | mcore-$(CONFIG_X86_SUMMIT) := arch/x86/mach-default |
92 | 92 | ||
93 | # generic subarchitecture | 93 | # generic subarchitecture |
94 | mflags-$(CONFIG_X86_GENERICARCH) := -Iinclude/asm-i386/mach-generic | 94 | mflags-$(CONFIG_X86_GENERICARCH) := -Iinclude/asm-x86/mach-generic |
95 | mcore-$(CONFIG_X86_GENERICARCH) := arch/x86/mach-default | 95 | mcore-$(CONFIG_X86_GENERICARCH) := arch/x86/mach-default |
96 | core-$(CONFIG_X86_GENERICARCH) += arch/x86/mach-generic/ | 96 | core-$(CONFIG_X86_GENERICARCH) += arch/x86/mach-generic/ |
97 | 97 | ||
98 | # ES7000 subarch support | 98 | # ES7000 subarch support |
99 | mflags-$(CONFIG_X86_ES7000) := -Iinclude/asm-i386/mach-es7000 | 99 | mflags-$(CONFIG_X86_ES7000) := -Iinclude/asm-x86/mach-es7000 |
100 | mcore-$(CONFIG_X86_ES7000) := arch/x86/mach-default | 100 | mcore-$(CONFIG_X86_ES7000) := arch/x86/mach-default |
101 | core-$(CONFIG_X86_ES7000) := arch/x86/mach-es7000/ | 101 | core-$(CONFIG_X86_ES7000) := arch/x86/mach-es7000/ |
102 | 102 | ||
@@ -104,7 +104,7 @@ core-$(CONFIG_X86_ES7000) := arch/x86/mach-es7000/ | |||
104 | core-$(CONFIG_XEN) += arch/x86/xen/ | 104 | core-$(CONFIG_XEN) += arch/x86/xen/ |
105 | 105 | ||
106 | # default subarch .h files | 106 | # default subarch .h files |
107 | mflags-y += -Iinclude/asm-i386/mach-default | 107 | mflags-y += -Iinclude/asm-x86/mach-default |
108 | 108 | ||
109 | head-y := arch/x86/kernel/head_32.o arch/x86/kernel/init_task_32.o | 109 | head-y := arch/x86/kernel/head_32.o arch/x86/kernel/init_task_32.o |
110 | 110 | ||