diff options
| author | Kukjin Kim | 2011-03-11 07:48:52 +0100 |
|---|---|---|
| committer | Kukjin Kim | 2011-03-11 07:48:52 +0100 |
| commit | 6d2f42cc275ba72a47ce6933b18480163ecf2740 (patch) | |
| tree | b986e612edd1d44fa64874601712060970308290 /arch/arm/plat-samsung/Makefile | |
| parent | Merge branch 'next-s3c2440-gta02' into for-next (diff) | |
| parent | ARM: SAMSUNG: Add PWM backlight support on Samsung S5PV210 (diff) | |
| download | kernel-qcow2-linux-6d2f42cc275ba72a47ce6933b18480163ecf2740.tar.gz kernel-qcow2-linux-6d2f42cc275ba72a47ce6933b18480163ecf2740.tar.xz kernel-qcow2-linux-6d2f42cc275ba72a47ce6933b18480163ecf2740.zip | |
Merge branch 'dev/pwm-backlight' into for-next
Conflicts:
arch/arm/mach-s3c64xx/mach-smdk6410.c
Diffstat (limited to 'arch/arm/plat-samsung/Makefile')
| -rw-r--r-- | arch/arm/plat-samsung/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile index 29932f88a8d6..e9de58a2e294 100644 --- a/arch/arm/plat-samsung/Makefile +++ b/arch/arm/plat-samsung/Makefile @@ -59,6 +59,7 @@ obj-$(CONFIG_SAMSUNG_DEV_ADC) += dev-adc.o obj-$(CONFIG_SAMSUNG_DEV_IDE) += dev-ide.o obj-$(CONFIG_SAMSUNG_DEV_TS) += dev-ts.o obj-$(CONFIG_SAMSUNG_DEV_KEYPAD) += dev-keypad.o +obj-$(CONFIG_SAMSUNG_DEV_PWM) += dev-pwm.o # DMA support |