diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2009-12-21 17:33:21 +0100 |
---|---|---|
committer | Lars-Peter Clausen <lars@metafoo.de> | 2009-12-21 17:35:17 +0100 |
commit | 61a317f3045240ea577a137c480c9d1fe76ad43a (patch) | |
tree | 0f4125d0a0843bf9132d873f44ed903872d0a2d5 /arch/arm/mach-s3c2442/Makefile | |
parent | dcdd2418c7d94123f3f687ef7befaf8319d72f9a (diff) | |
parent | b9943538bfbb6f99bfc08e744896d7593318b07b (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
arch/arm/mach-s3c2442/mach-gta02.c
Diffstat (limited to 'arch/arm/mach-s3c2442/Makefile')
-rw-r--r-- | arch/arm/mach-s3c2442/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2442/Makefile b/arch/arm/mach-s3c2442/Makefile index ebe0579c537..cf39481cb5c 100644 --- a/arch/arm/mach-s3c2442/Makefile +++ b/arch/arm/mach-s3c2442/Makefile @@ -16,6 +16,7 @@ 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-pm-wlan.o \ + gta02-fiq.o # Machine support |