1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/w1/Makefile b/drivers/w1/Makefile
index 01fb54391470..0c2aa22d8c04 100644
--- a/drivers/w1/Makefile
+++ b/drivers/w1/Makefile
@@ -13,13 +13,5 @@ endif
 obj-$(CONFIG_W1)        += wire.o
 wire-objs               := w1.o w1_int.o w1_family.o w1_netlink.o w1_io.o
-obj-$(CONFIG_W1_MATROX)         += matrox_w1.o
+obj-y                   += masters/ slaves/
-obj-$(CONFIG_W1_THERM)          += w1_therm.o
-obj-$(CONFIG_W1_SMEM)           += w1_smem.o
-obj-$(CONFIG_W1_DS9490)         += ds9490r.o
-ds9490r-objs    := dscore.o
-obj-$(CONFIG_W1_DS9490_BRIDGE)  += ds_w1_bridge.o
-obj-$(CONFIG_W1_DS2433)         += w1_ds2433.o

diff --git a/drivers/w1/Makefile b/drivers/w1/Makefile index 01fb54391470..0c2aa22d8c04 100644 --- a/drivers/w1/Makefile +++ b/drivers/w1/Makefile
@@ -13,13 +13,5 @@ endif
13	obj-$(CONFIG_W1) += wire.o	13	obj-$(CONFIG_W1) += wire.o
14	wire-objs := w1.o w1_int.o w1_family.o w1_netlink.o w1_io.o	14	wire-objs := w1.o w1_int.o w1_family.o w1_netlink.o w1_io.o
15		15
16	obj-$(CONFIG_W1_MATROX) += matrox_w1.o	16	obj-y += masters/ slaves/
17	obj-$(CONFIG_W1_THERM) += w1_therm.o
18	obj-$(CONFIG_W1_SMEM) += w1_smem.o
19		17
20	obj-$(CONFIG_W1_DS9490) += ds9490r.o
21	ds9490r-objs := dscore.o
22
23	obj-$(CONFIG_W1_DS9490_BRIDGE) += ds_w1_bridge.o
24
25	obj-$(CONFIG_W1_DS2433) += w1_ds2433.o