aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c2440/Makefile
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2010-05-18 01:01:49 +0200
committerLars-Peter Clausen <lars@metafoo.de>2010-05-18 01:01:49 +0200
commitcd3258c9d166f8c64a85b0cd2c0cd64342d69eb8 (patch)
tree0308b57e53c74521f8df7dc56784ee96682b0059 /arch/arm/mach-s3c2440/Makefile
parentf1f8ac32dddfb765e8d57fdb3b3e9c10727a0873 (diff)
parent8b604bd0f2f3e097bb2fc8b558a0f4e6ca7bdb13 (diff)
Merge branch 'gta02-machine-2.6.34' into om-gta02-2.6.34
Diffstat (limited to 'arch/arm/mach-s3c2440/Makefile')
-rw-r--r--arch/arm/mach-s3c2440/Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/Makefile b/arch/arm/mach-s3c2440/Makefile
index c85ba32d895..6ce800d220f 100644
--- a/arch/arm/mach-s3c2440/Makefile
+++ b/arch/arm/mach-s3c2440/Makefile
@@ -33,7 +33,12 @@ obj-$(CONFIG_ARCH_S3C2440) += mach-smdk2440.o
obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o
obj-$(CONFIG_MACH_AT2440EVB) += mach-at2440evb.o
obj-$(CONFIG_MACH_MINI2440) += mach-mini2440.o
-obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o
+obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o \
+ gta02-pm-bt.o \
+ gta02-pm-gps.o \
+ gta02-pm-gsm.o \
+ gta02-pm-wlan.o \
+ gta02-fiq.o \
# extra machine support