X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fw1%2FMakefile;h=6bb0b54965f2ac3d1257cadea6a2d7911f2aa13e;hb=9465efc9e96135a2cec8154c0c766fa59984a298;hp=01fb54391470e78cc60959028528d3a7ac2b2971;hpb=9189674026e86e624b1ef1b4eb430e9ad19f9641;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/w1/Makefile b/drivers/w1/Makefile
index 01fb5439147..6bb0b54965f 100644
--- a/drivers/w1/Makefile
+++ b/drivers/w1/Makefile
@@ -2,24 +2,8 @@
 # Makefile for the Dallas's 1-wire bus.
 #
 
-ifneq ($(CONFIG_NET), y)
-EXTRA_CFLAGS	+= -DNETLINK_DISABLED
-endif
-
-ifeq ($(CONFIG_W1_DS2433_CRC), y)
-EXTRA_CFLAGS	+= -DCONFIG_W1_F23_CRC
-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/
 
-obj-$(CONFIG_W1_DS2433)		+= w1_ds2433.o