diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 09:09:29 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 09:09:29 -0400 |
| commit | 054d5c9238f3c577ad51195c3ee7803613f322cc (patch) | |
| tree | ff7d9f5c0e0ddf14230ba28f28ef69a2c0a0debf /arch/arm/configs/s5pv210_defconfig | |
| parent | 11e4afb49b7fa1fc8e1ffd850c1806dd86a08204 (diff) | |
| parent | 2192482ee5ce5d5d4a6cec0c351b2d3a744606eb (diff) | |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/configs/s5pv210_defconfig')
| -rw-r--r-- | arch/arm/configs/s5pv210_defconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/configs/s5pv210_defconfig b/arch/arm/configs/s5pv210_defconfig index 1753836d0055..0488a1eb4d7d 100644 --- a/arch/arm/configs/s5pv210_defconfig +++ b/arch/arm/configs/s5pv210_defconfig | |||
| @@ -7,6 +7,11 @@ CONFIG_MODULE_UNLOAD=y | |||
| 7 | # CONFIG_BLK_DEV_BSG is not set | 7 | # CONFIG_BLK_DEV_BSG is not set |
| 8 | CONFIG_ARCH_S5PV210=y | 8 | CONFIG_ARCH_S5PV210=y |
| 9 | CONFIG_S3C_LOWLEVEL_UART_PORT=1 | 9 | CONFIG_S3C_LOWLEVEL_UART_PORT=1 |
| 10 | CONFIG_S3C_DEV_FB=y | ||
| 11 | CONFIG_S5PV210_SETUP_FB_24BPP=y | ||
| 12 | CONFIG_MACH_AQUILA=y | ||
| 13 | CONFIG_MACH_GONI=y | ||
| 14 | CONFIG_MACH_SMDKC110=y | ||
| 10 | CONFIG_MACH_SMDKV210=y | 15 | CONFIG_MACH_SMDKV210=y |
| 11 | CONFIG_VMSPLIT_2G=y | 16 | CONFIG_VMSPLIT_2G=y |
| 12 | CONFIG_PREEMPT=y | 17 | CONFIG_PREEMPT=y |