summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ep93xx/Makefile
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2010-03-09 23:22:08 +0100
committerJ. Bruce Fields <bfields@citi.umich.edu>2010-03-09 23:22:08 +0100
commite739cf1da48e841bc5d744a99764c1a668b4bdd2 (patch)
tree1d39318bbbcdd66ad8cd34823ad9befb7af08b1f /arch/arm/mach-ep93xx/Makefile
parentnfsd4: document lease/grace-period limits (diff)
parentLinux 2.6.34-rc1 (diff)
downloadlinux-e739cf1da48e841bc5d744a99764c1a668b4bdd2.tar.xz
linux-e739cf1da48e841bc5d744a99764c1a668b4bdd2.zip
Merge commit 'v2.6.34-rc1' into for-2.6.35-incoming
Diffstat (limited to 'arch/arm/mach-ep93xx/Makefile')
-rw-r--r--arch/arm/mach-ep93xx/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-ep93xx/Makefile b/arch/arm/mach-ep93xx/Makefile
index eae6199a9891..33ee2c863d18 100644
--- a/arch/arm/mach-ep93xx/Makefile
+++ b/arch/arm/mach-ep93xx/Makefile
@@ -10,4 +10,6 @@ obj-$(CONFIG_MACH_ADSSPHERE) += adssphere.o
obj-$(CONFIG_MACH_EDB93XX) += edb93xx.o
obj-$(CONFIG_MACH_GESBC9312) += gesbc9312.o
obj-$(CONFIG_MACH_MICRO9) += micro9.o
+obj-$(CONFIG_MACH_SIM_ONE) += simone.o
+obj-$(CONFIG_MACH_SNAPPER_CL15) += snappercl15.o
obj-$(CONFIG_MACH_TS72XX) += ts72xx.o