Merge 'staging-next' to Linus's tree
[linux-2.6.git] / drivers / misc / Makefile
index 4be5c6f..47af4cd 100644 (file)
@@ -40,3 +40,4 @@ 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/