diff options
author | 2009-01-18 18:37:14 +0100 | |
---|---|---|
committer | 2009-01-18 18:37:14 +0100 | |
commit | b2b062b8163391c42b3219d466ca1ac9742b9c7b (patch) | |
tree | f3f920c09b8de694b1bc1d4b878cfd2b0b98c913 /arch/xtensa/platforms/xt2000/Makefile | |
parent | Merge branch 'linus' into stackprotector (diff) | |
parent | Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/percpu (diff) | |
download | linux-dev-b2b062b8163391c42b3219d466ca1ac9742b9c7b.tar.xz linux-dev-b2b062b8163391c42b3219d466ca1ac9742b9c7b.zip |
Merge branch 'core/percpu' into stackprotector
Conflicts:
arch/x86/include/asm/pda.h
arch/x86/include/asm/system.h
Also, moved include/asm-x86/stackprotector.h to arch/x86/include/asm.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/xtensa/platforms/xt2000/Makefile')
-rw-r--r-- | arch/xtensa/platforms/xt2000/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/xtensa/platforms/xt2000/Makefile b/arch/xtensa/platforms/xt2000/Makefile new file mode 100644 index 000000000000..54d018e45bfc --- /dev/null +++ b/arch/xtensa/platforms/xt2000/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the Tensilica XT2000 Emulation Board +# + +obj-y = setup.o |