summaryrefslogtreecommitdiffstats
path: root/drivers/pwm/Makefile
diff options
context:
space:
mode:
authorThierry Reding <thierry.reding@gmail.com>2016-07-25 16:23:39 +0200
committerThierry Reding <thierry.reding@gmail.com>2016-07-25 16:23:39 +0200
commit070d9a930620399a83127be6e7c6d2c2cc84a553 (patch)
tree0be3bf65cd14597828857d72f40d5552b7de591c /drivers/pwm/Makefile
parentbd2686122d3b45db1398776921bd47fedfd6d6a5 (diff)
parent1f0d3bb02785f698dc273b9006a473194c32f874 (diff)
downloadlinux-stable-070d9a930620399a83127be6e7c6d2c2cc84a553.tar.gz
linux-stable-070d9a930620399a83127be6e7c6d2c2cc84a553.tar.bz2
linux-stable-070d9a930620399a83127be6e7c6d2c2cc84a553.zip
Merge branch 'for-4.8/drivers' into for-next
Diffstat (limited to 'drivers/pwm/Makefile')
-rw-r--r--drivers/pwm/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pwm/Makefile b/drivers/pwm/Makefile
index dd35bc121a18..feef1dd29f73 100644
--- a/drivers/pwm/Makefile
+++ b/drivers/pwm/Makefile
@@ -4,6 +4,7 @@ obj-$(CONFIG_PWM_AB8500) += pwm-ab8500.o
obj-$(CONFIG_PWM_ATMEL) += pwm-atmel.o
obj-$(CONFIG_PWM_ATMEL_HLCDC_PWM) += pwm-atmel-hlcdc.o
obj-$(CONFIG_PWM_ATMEL_TCB) += pwm-atmel-tcb.o
+obj-$(CONFIG_PWM_BCM_IPROC) += pwm-bcm-iproc.o
obj-$(CONFIG_PWM_BCM_KONA) += pwm-bcm-kona.o
obj-$(CONFIG_PWM_BCM2835) += pwm-bcm2835.o
obj-$(CONFIG_PWM_BERLIN) += pwm-berlin.o
@@ -11,6 +12,7 @@ obj-$(CONFIG_PWM_BFIN) += pwm-bfin.o
obj-$(CONFIG_PWM_BRCMSTB) += pwm-brcmstb.o
obj-$(CONFIG_PWM_CLPS711X) += pwm-clps711x.o
obj-$(CONFIG_PWM_CRC) += pwm-crc.o
+obj-$(CONFIG_PWM_CROS_EC) += pwm-cros-ec.o
obj-$(CONFIG_PWM_EP93XX) += pwm-ep93xx.o
obj-$(CONFIG_PWM_FSL_FTM) += pwm-fsl-ftm.o
obj-$(CONFIG_PWM_IMG) += pwm-img.o
@@ -34,6 +36,7 @@ obj-$(CONFIG_PWM_ROCKCHIP) += pwm-rockchip.o
obj-$(CONFIG_PWM_SAMSUNG) += pwm-samsung.o
obj-$(CONFIG_PWM_SPEAR) += pwm-spear.o
obj-$(CONFIG_PWM_STI) += pwm-sti.o
+obj-$(CONFIG_PWM_STMPE) += pwm-stmpe.o
obj-$(CONFIG_PWM_SUN4I) += pwm-sun4i.o
obj-$(CONFIG_PWM_TEGRA) += pwm-tegra.o
obj-$(CONFIG_PWM_TIECAP) += pwm-tiecap.o