Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / w1 / Makefile

diff --git a/drivers/w1/Makefile b/drivers/w1/Makefile
index a389bdc..0c2aa22 100644 (file)
--- a/drivers/w1/Makefile
+++ b/drivers/w1/Makefile
@@ -2,15 +2,16 @@
 # Makefile for the Dallas's 1-wire bus.
 #
 
-obj-$(CONFIG_W1)       += wire.o
-wire-objs              := w1.o w1_int.o w1_family.o w1_netlink.o w1_io.o
+ifneq ($(CONFIG_NET), y)
+EXTRA_CFLAGS   += -DNETLINK_DISABLED
+endif
 
-obj-$(CONFIG_W1_MATROX)                += matrox_w1.o
-obj-$(CONFIG_W1_THERM)         += w1_therm.o
-obj-$(CONFIG_W1_SMEM)          += w1_smem.o
+ifeq ($(CONFIG_W1_DS2433_CRC), y)
+EXTRA_CFLAGS   += -DCONFIG_W1_F23_CRC
+endif
 
-obj-$(CONFIG_W1_DS9490)                += ds9490r.o 
-ds9490r-objs    := dscore.o
+obj-$(CONFIG_W1)       += wire.o
+wire-objs              := w1.o w1_int.o w1_family.o w1_netlink.o w1_io.o
 
-obj-$(CONFIG_W1_DS9490_BRIDGE) += ds_w1_bridge.o
+obj-y                  += masters/ slaves/