diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-03-11 15:48:52 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-03-11 15:48:52 +0900 |
| commit | 6d2f42cc275ba72a47ce6933b18480163ecf2740 (patch) | |
| tree | b986e612edd1d44fa64874601712060970308290 /arch/arm/mach-s5pv210/Kconfig | |
| parent | a9518cde232960875a1f03ba00c112f56872cf60 (diff) | |
| parent | 5cd435b4ab881280fb0b8ce6686cfceb005d98c8 (diff) | |
Merge branch 'dev/pwm-backlight' into for-next
Conflicts:
arch/arm/mach-s3c64xx/mach-smdk6410.c
Diffstat (limited to 'arch/arm/mach-s5pv210/Kconfig')
| -rw-r--r-- | arch/arm/mach-s5pv210/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig index 53aabef1e9c..d7fd031f601 100644 --- a/arch/arm/mach-s5pv210/Kconfig +++ b/arch/arm/mach-s5pv210/Kconfig @@ -130,6 +130,7 @@ config MACH_SMDKV210 select SAMSUNG_DEV_ADC select SAMSUNG_DEV_IDE select SAMSUNG_DEV_KEYPAD + select SAMSUNG_DEV_PWM select SAMSUNG_DEV_TS select S5PV210_SETUP_FB_24BPP select S5PV210_SETUP_I2C1 |