Pull thinkpad-2.6.24 into release branch

[linux-2.6] / drivers / w1 / masters / Makefile

diff --git a/drivers/w1/masters/Makefile b/drivers/w1/masters/Makefile
index 4cee256a8134dcdffd4aa71e345c4050abb06747..11551b328186fb23de8a9ddc71f1a13350d802dd 100644 (file)
--- a/drivers/w1/masters/Makefile
+++ b/drivers/w1/masters/Makefile
@@ -5,4 +5,4 @@
 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