summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx1/Makefile
diff options
context:
space:
mode:
authorFelix Blyakher <felixb@sgi.com>2009-03-31 05:08:33 +0200
committerFelix Blyakher <felixb@sgi.com>2009-03-31 05:08:33 +0200
commit930861c4e6f13ce2e7d06cd1ef11441a065517d9 (patch)
treedf6ff01f89768ff8d6fe6a64491be30e6e56c3e0 /arch/arm/mach-mx1/Makefile
parentxfs: increase the maximum number of supported ACL entries (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
downloadlinux-930861c4e6f13ce2e7d06cd1ef11441a065517d9.tar.xz
linux-930861c4e6f13ce2e7d06cd1ef11441a065517d9.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-mx1/Makefile')
-rw-r--r--arch/arm/mach-mx1/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-mx1/Makefile b/arch/arm/mach-mx1/Makefile
index b969719011fa..82f1309568ef 100644
--- a/arch/arm/mach-mx1/Makefile
+++ b/arch/arm/mach-mx1/Makefile
@@ -8,3 +8,4 @@ obj-y += generic.o clock.o devices.o
# Specific board support
obj-$(CONFIG_ARCH_MX1ADS) += mx1ads.o
+obj-$(CONFIG_MACH_SCB9328) += scb9328.o \ No newline at end of file