Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / w1 / masters / Makefile

diff --git a/drivers/w1/masters/Makefile b/drivers/w1/masters/Makefile
index 040d2ae4f2ad092a334f92b4e8349de306c381c4..1daeb6e4b956a181eb797682b0b3986841545e18 100644 (file)
--- a/drivers/w1/masters/Makefile
+++ b/drivers/w1/masters/Makefile
@@ -7,3 +7,4 @@ 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