diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 14:35:23 +0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 14:37:32 +0400 |
commit | 365d46dc9be9b3c833990a06f3994b1987eda578 (patch) | |
tree | 9397d1304144a288411f2118707f44ff5e862fa6 /arch/mips/alchemy/pb1500/Makefile | |
parent | 5dc64a3442b98eaa0e3730c35fcf00cf962a93e7 (diff) | |
parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
download | linux-365d46dc9be9b3c833990a06f3994b1987eda578.tar.xz |
Merge branch 'linus' into x86/xen
Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/process_64.c
arch/x86/xen/enlighten.c
Diffstat (limited to 'arch/mips/alchemy/pb1500/Makefile')
-rw-r--r-- | arch/mips/alchemy/pb1500/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/mips/alchemy/pb1500/Makefile b/arch/mips/alchemy/pb1500/Makefile new file mode 100644 index 000000000000..602f38df20bb --- /dev/null +++ b/arch/mips/alchemy/pb1500/Makefile @@ -0,0 +1,8 @@ +# +# Copyright 2000, 2001, 2008 MontaVista Software Inc. +# Author: MontaVista Software, Inc. <source@mvista.com> +# +# Makefile for the Alchemy Semiconductor Pb1500 board. +# + +lib-y := init.o board_setup.o irqmap.o |