Merge branches 'sh/memchunk' and 'common/mmcif' into sh-latest

[~andy/linux] / drivers / misc / Makefile

diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 4be5c6fc5ef4a47ae8a16c213492beba700321bb..98009cc20cb9c6c887a200bfe96c85948a311be5 100644 (file)
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -40,3 +40,5 @@ obj-y                         += cb710/
 obj-$(CONFIG_VMWARE_BALLOON)   += vmw_balloon.o
 obj-$(CONFIG_ARM_CHARLCD)      += arm-charlcd.o
 obj-$(CONFIG_PCH_PHUB)         += pch_phub.o
+obj-y                          += ti-st/
+obj-$(CONFIG_AB8500_PWM)       += ab8500-pwm.o