X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fw1%2FMakefile;h=6bb0b54965f2ac3d1257cadea6a2d7911f2aa13e;hb=refs%2Fheads%2Fvserver;hp=80725c348e704fe185d441aa6c6747747b6e3250;hpb=6a77f38946aaee1cd85eeec6cf4229b204c15071;p=linux-2.6.git

diff --git a/drivers/w1/Makefile b/drivers/w1/Makefile
index 80725c348..6bb0b5496 100644
--- a/drivers/w1/Makefile
+++ b/drivers/w1/Makefile
@@ -2,19 +2,8 @@
 # Makefile for the Dallas's 1-wire bus.
 #
 
-ifneq ($(CONFIG_NET), y)
-EXTRA_CFLAGS	+= -DNETLINK_DISABLED
-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-$(CONFIG_W1_DS9490)		+= ds9490r.o 
-ds9490r-objs    := dscore.o
-
-obj-$(CONFIG_W1_DS9490_BRIDGE)	+= ds_w1_bridge.o
+obj-y			+= masters/ slaves/