diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-16 12:09:10 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-16 12:09:10 +0300 |
commit | af2519fb2298cdf7540082c36f4d8c66bbff103f (patch) | |
tree | 1d290d28d42d42f9e693457762c4008988628060 /arch/mips/alchemy/devboards/pb1000/Makefile | |
parent | 961d7d0ee5150e0197cc81c2a8884ecb230276e2 (diff) | |
parent | 7cb36b6ccdca03bd87e8faca7fd920643dd1aec7 (diff) | |
download | linux-af2519fb2298cdf7540082c36f4d8c66bbff103f.tar.xz |
Merge branch 'linus' into core/iommu
Conflicts:
arch/ia64/include/asm/dma-mapping.h
arch/ia64/include/asm/machvec.h
arch/ia64/include/asm/machvec_sn2.h
Diffstat (limited to 'arch/mips/alchemy/devboards/pb1000/Makefile')
-rw-r--r-- | arch/mips/alchemy/devboards/pb1000/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/mips/alchemy/devboards/pb1000/Makefile b/arch/mips/alchemy/devboards/pb1000/Makefile new file mode 100644 index 000000000000..97c6615ba2bb --- /dev/null +++ b/arch/mips/alchemy/devboards/pb1000/Makefile @@ -0,0 +1,8 @@ +# +# Copyright 2000, 2008 MontaVista Software Inc. +# Author: MontaVista Software, Inc. <source@mvista.com> +# +# Makefile for the Alchemy Semiconductor Pb1000 board. +# + +obj-y := board_setup.o |