diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-30 10:52:32 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-30 10:52:32 +0900 |
| commit | 0ae9a22b45b9e9d0f6058e5257b2daf48036dd35 (patch) | |
| tree | 9f7b388ab5eef34f00f4a4c7e476c61cc17d5bdc /arch/arm/mach-s5pv210/Kconfig | |
| parent | 5ed76f3d98ffb6ebd754fc7c4cae547d6ffed5ff (diff) | |
| parent | 8f49720d5afb42dc7c0ced2cd94d561fbe9560d9 (diff) | |
Merge branch 'next-s5pv210' into for-next-new
Conflicts:
arch/arm/mach-s5pv210/mach-smdkv210.c
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 862f239a0fd..53aabef1e9c 100644 --- a/arch/arm/mach-s5pv210/Kconfig +++ b/arch/arm/mach-s5pv210/Kconfig @@ -118,6 +118,7 @@ menu "S5PV210 Machines" config MACH_SMDKV210 bool "SMDKV210" select CPU_S5PV210 + select S3C_DEV_FB select S3C_DEV_HSMMC select S3C_DEV_HSMMC1 select S3C_DEV_HSMMC2 @@ -130,6 +131,7 @@ config MACH_SMDKV210 select SAMSUNG_DEV_IDE select SAMSUNG_DEV_KEYPAD select SAMSUNG_DEV_TS + select S5PV210_SETUP_FB_24BPP select S5PV210_SETUP_I2C1 select S5PV210_SETUP_I2C2 select S5PV210_SETUP_IDE |