diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-22 22:46:24 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-22 22:46:24 +0000 |
commit | 25cf0398bdf365d027e171116aa4a281e9cd3c1c (patch) | |
tree | a8be3d3d314625a376be0e62c67809dc22274dd4 /arch/arm/mach-mmp/Makefile | |
parent | 9326845f45650f6af9953a4b6a31e89b54fab82f (diff) | |
parent | 59bdd133561a432c4655146e283caf85fa64c2fb (diff) | |
download | linux-stable-25cf0398bdf365d027e171116aa4a281e9cd3c1c.tar.gz linux-stable-25cf0398bdf365d027e171116aa4a281e9cd3c1c.tar.bz2 linux-stable-25cf0398bdf365d027e171116aa4a281e9cd3c1c.zip |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/mach-mmp/Makefile')
-rw-r--r-- | arch/arm/mach-mmp/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-mmp/Makefile b/arch/arm/mach-mmp/Makefile index 751cdbf733c8..5c68382141af 100644 --- a/arch/arm/mach-mmp/Makefile +++ b/arch/arm/mach-mmp/Makefile @@ -15,6 +15,7 @@ obj-$(CONFIG_MACH_ZYLONITE2) += aspenite.o obj-$(CONFIG_MACH_AVENGERS_LITE)+= avengers_lite.o obj-$(CONFIG_MACH_TAVOREVB) += tavorevb.o obj-$(CONFIG_MACH_TTC_DKB) += ttc_dkb.o +obj-$(CONFIG_MACH_BROWNSTONE) += brownstone.o obj-$(CONFIG_MACH_FLINT) += flint.o obj-$(CONFIG_MACH_MARVELL_JASPER) += jasper.o obj-$(CONFIG_MACH_TETON_BGA) += teton_bga.o |