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/Kconfig | |
| 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/Kconfig')
| -rw-r--r-- | arch/arm/mach-s3c2442/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2442/Kconfig b/arch/arm/mach-s3c2442/Kconfig index 2e33904759c..bdb37dd567d 100644 --- a/arch/arm/mach-s3c2442/Kconfig +++ b/arch/arm/mach-s3c2442/Kconfig @@ -35,6 +35,9 @@ config MACH_NEO1973_GTA02 select S3C2410_PWM select S3C_DEV_USB_HOST select S3C_DEV_NAND + select FIQ + select S3C_PWM + select S3C24XX_GPIO_EXTRA64 help Say Y here if you are using the Openmoko GTA02 / Freerunner GSM Phone |