diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2010-01-22 11:35:02 +0100 |
---|---|---|
committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-01-22 11:35:02 +0100 |
commit | 4b77b926aee4832bdb86b46fc5a7b0f2e4467225 (patch) | |
tree | ca6050d70f12549a54e47f980313bf7f18e1097e /arch/arm/mach-s3c2442/Makefile | |
parent | eb97ba7e3da8998565058aedd3d57c1859083271 (diff) | |
parent | efafd86ce0ed4494b150fd6b79965aaa65ff99dc (diff) |
Merge branch 'gta02-machine-2.6.32' into gta02-machine-devices-2.6.32
Conflicts:
arch/arm/mach-s3c2442/Kconfig
arch/arm/mach-s3c2442/Makefile
arch/arm/mach-s3c2442/mach-gta02.c
Diffstat (limited to 'arch/arm/mach-s3c2442/Makefile')
-rw-r--r-- | arch/arm/mach-s3c2442/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2442/Makefile b/arch/arm/mach-s3c2442/Makefile index 87338d9e139..6247ca03eae 100644 --- a/arch/arm/mach-s3c2442/Makefile +++ b/arch/arm/mach-s3c2442/Makefile @@ -13,6 +13,10 @@ obj-$(CONFIG_CPU_S3C2442) += s3c2442.o obj-$(CONFIG_CPU_S3C2442) += clock.o obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o \ - gta02-fiq.o + gta02-fiq.o \ + gta02-pm-bt.o \ + gta02-pm-gps.o \ + gta02-pm-gsm.o \ + gta02-pm-wlan.o # Machine support |