diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 05:51:59 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 05:51:59 -0400 |
| commit | fac3d3555568de1755025a9609daf492dd548a59 (patch) | |
| tree | 694d468070c32d9a01223ef76c2610ec3f5d4ff7 /arch/arm/mach-s5pv210/Kconfig | |
| parent | d48562abe29ceee66a6aad7b565b021ddd7f598a (diff) | |
| parent | 41d8289d161e23e9cff78c914b6f37f30e627ea2 (diff) | |
ARM: Merge for-2635-4/ts-machines
Merge branch 'for-2635-4/ts-machines' into for-2635-4/partial1
Diffstat (limited to 'arch/arm/mach-s5pv210/Kconfig')
| -rw-r--r-- | arch/arm/mach-s5pv210/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig index 8b9566e0cc51..5649733bf815 100644 --- a/arch/arm/mach-s5pv210/Kconfig +++ b/arch/arm/mach-s5pv210/Kconfig | |||
| @@ -26,6 +26,8 @@ config MACH_SMDKV210 | |||
| 26 | bool "SMDKV210" | 26 | bool "SMDKV210" |
| 27 | select CPU_S5PV210 | 27 | select CPU_S5PV210 |
| 28 | select ARCH_SPARSEMEM_ENABLE | 28 | select ARCH_SPARSEMEM_ENABLE |
| 29 | select SAMSUNG_DEV_ADC | ||
| 30 | select SAMSUNG_DEV_TS | ||
| 29 | help | 31 | help |
| 30 | Machine support for Samsung SMDKV210 | 32 | Machine support for Samsung SMDKV210 |
| 31 | 33 | ||