diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-23 13:26:27 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-23 13:26:27 +0200 |
| commit | 101d5b713700b902b1c200cdd1925c3cb7d34567 (patch) | |
| tree | a0d4b4140129ad2f24fd17b965dfcfbbb1ac01db /arch/x86/es7000/Makefile | |
| parent | cec5eb7be3a104fffd27ca967ee8e15a123050e2 (diff) | |
| parent | e6babb6b7fed93c93f8fc5ef8ebd3a474fc2df3e (diff) | |
Merge branch 'x86/signal' into core/signal
Conflicts:
arch/x86/kernel/cpu/feature_names.c
arch/x86/kernel/setup.c
drivers/pci/intel-iommu.c
include/asm-x86/cpufeature.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/es7000/Makefile')
| -rw-r--r-- | arch/x86/es7000/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/es7000/Makefile b/arch/x86/es7000/Makefile new file mode 100644 index 00000000000..3ef8b43b62f --- /dev/null +++ b/arch/x86/es7000/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the linux kernel. +# + +obj-$(CONFIG_X86_ES7000) := es7000plat.o |