drm/i915: make hw page ioremap use ioremap_wc

[linux-2.6-block.git] / net / Makefile

diff --git a/net/Makefile b/net/Makefile
index e5af3dc3a037b069e8573bfb4d4a9eda15106efa..0fcce89d71691e3f707773599ff96f3b75f84e0a 100644 (file)
--- a/net/Makefile
+++ b/net/Makefile
@@ -56,10 +56,11 @@ obj-$(CONFIG_NETLABEL)              += netlabel/
 obj-$(CONFIG_IUCV)             += iucv/
 obj-$(CONFIG_RFKILL)           += rfkill/
 obj-$(CONFIG_NET_9P)           += 9p/
-ifeq ($(CONFIG_DCBNL),y)
-obj-$(CONFIG_DCB)              += dcb/
+ifneq ($(CONFIG_DCB),)
+obj-y                          += dcb/
 endif
 
 ifeq ($(CONFIG_NET),y)
 obj-$(CONFIG_SYSCTL)           += sysctl_net.o
 endif
+obj-$(CONFIG_WIMAX)            += wimax/