Pull acpi_device_handle_cleanup into release branch

[linux-2.6] / drivers / w1 / Makefile

diff --git a/drivers/w1/Makefile b/drivers/w1/Makefile
index 0c2aa22..93845a2 100644 (file)
--- a/drivers/w1/Makefile
+++ b/drivers/w1/Makefile
@@ -2,10 +2,6 @@
 # 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