diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-15 07:45:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-15 07:45:59 -0400 |
| commit | 91d0322bef047e2916b3e52741411bffc63929cb (patch) | |
| tree | 44c4fd13cc17755a6db8a3d70cffb86e57a838dc /arch/x86/mach-generic/Makefile | |
| parent | 065cb3dfe24978651caedfa54da585388ad15dde (diff) | |
| parent | 50515af207d410c9f228380e529c56f43c3de0bd (diff) | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'arch/x86/mach-generic/Makefile')
| -rw-r--r-- | arch/x86/mach-generic/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/x86/mach-generic/Makefile b/arch/x86/mach-generic/Makefile index 19d6d407737b..0dbd7803a1d5 100644 --- a/arch/x86/mach-generic/Makefile +++ b/arch/x86/mach-generic/Makefile | |||
| @@ -2,7 +2,11 @@ | |||
| 2 | # Makefile for the generic architecture | 2 | # Makefile for the generic architecture |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | EXTRA_CFLAGS := -Iarch/x86/kernel | 5 | EXTRA_CFLAGS := -Iarch/x86/kernel |
| 6 | 6 | ||
| 7 | obj-y := probe.o summit.o bigsmp.o es7000.o default.o | 7 | obj-y := probe.o default.o |
| 8 | obj-y += ../../x86/mach-es7000/ | 8 | obj-$(CONFIG_X86_NUMAQ) += numaq.o |
| 9 | obj-$(CONFIG_X86_SUMMIT) += summit.o | ||
| 10 | obj-$(CONFIG_X86_BIGSMP) += bigsmp.o | ||
| 11 | obj-$(CONFIG_X86_ES7000) += es7000.o | ||
| 12 | obj-$(CONFIG_X86_ES7000) += ../../x86/mach-es7000/ | ||