Merge current mainline tree into linux-omap tree

[pandora-kernel.git] / drivers / w1 / masters / Makefile

diff --git a/drivers/w1/masters/Makefile b/drivers/w1/masters/Makefile
index 11551b3..1daeb6e 100644 (file)
--- a/drivers/w1/masters/Makefile
+++ b/drivers/w1/masters/Makefile
@@ -6,3 +6,5 @@ obj-$(CONFIG_W1_MASTER_MATROX)          += matrox_w1.o
 obj-$(CONFIG_W1_MASTER_DS2490)         += ds2490.o
 obj-$(CONFIG_W1_MASTER_DS2482)         += ds2482.o
 obj-$(CONFIG_W1_MASTER_DS1WM)          += ds1wm.o
+obj-$(CONFIG_HDQ_MASTER_OMAP)          += omap_hdq.o
+obj-$(CONFIG_W1_MASTER_GPIO)           += w1-gpio.o