diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2010-01-22 13:07:40 +0100 |
---|---|---|
committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-01-22 13:07:40 +0100 |
commit | 159b90922d47078834dda75f3efab63c1bbecab6 (patch) | |
tree | 57a9cfde3e5dbeb2e4ccd57e4a6ed035988511c0 /arch/arm/mach-s3c2442/Makefile | |
parent | 058cbf4220fd2f1cd970bf553c044cb178e3804e (diff) | |
parent | 045da0e232795ff0637ee1c38a9822c9b823f4e7 (diff) |
Merge branch 'gta02-machine-devices-2.6.32' into om-gta02-2.6.32
Conflicts:
arch/arm/mach-s3c2442/Kconfig
arch/arm/mach-s3c2442/Makefile
Diffstat (limited to 'arch/arm/mach-s3c2442/Makefile')
-rw-r--r-- | arch/arm/mach-s3c2442/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2442/Makefile b/arch/arm/mach-s3c2442/Makefile index cf39481cb5c..6247ca03eae 100644 --- a/arch/arm/mach-s3c2442/Makefile +++ b/arch/arm/mach-s3c2442/Makefile @@ -13,10 +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-pm-bt.o \ gta02-pm-gps.o \ gta02-pm-gsm.o \ - gta02-pm-wlan.o \ - gta02-fiq.o + gta02-pm-wlan.o # Machine support |