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 1f3c8b983dc13d0877cc67a8f6305df47744e235..11551b328186fb23de8a9ddc71f1a13350d802dd 100644 (file)
--- a/drivers/w1/masters/Makefile
+++ b/drivers/w1/masters/Makefile
@@ -3,11 +3,6 @@
 #
 
 obj-$(CONFIG_W1_MASTER_MATROX)         += matrox_w1.o
-
-obj-$(CONFIG_W1_MASTER_DS9490)         += ds9490r.o
-ds9490r-objs    := dscore.o
-
-obj-$(CONFIG_W1_MASTER_DS9490_BRIDGE)  += ds_w1_bridge.o
-
+obj-$(CONFIG_W1_MASTER_DS2490)         += ds2490.o
 obj-$(CONFIG_W1_MASTER_DS2482)         += ds2482.o
-
+obj-$(CONFIG_W1_MASTER_DS1WM)          += ds1wm.o