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