[PATCH] W1: Move w1 bus master code into 'w1/masters' and move w1 slave code into...

[mirror_ubuntu-artful-kernel.git] / drivers / w1 / Makefile

diff --git a/drivers/w1/Makefile b/drivers/w1/Makefile
index 01fb54391470e78cc60959028528d3a7ac2b2971..0c2aa22d8c04ca6d0d89406431381bac62e8ac39 100644 (file)
--- 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-$(CONFIG_W1_THERM)         += w1_therm.o
-obj-$(CONFIG_W1_SMEM)          += w1_smem.o
+obj-y                  += masters/ slaves/
 
-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