Pull misc-for-upstream into release branch

[linux-2.6] / net / Makefile

diff --git a/net/Makefile b/net/Makefile
index ad4d14f..4854ac5 100644 (file)
--- a/net/Makefile
+++ b/net/Makefile
@@ -47,6 +47,7 @@ obj-$(CONFIG_IP_SCTP)         += sctp/
 obj-$(CONFIG_IEEE80211)                += ieee80211/
 obj-$(CONFIG_TIPC)             += tipc/
 obj-$(CONFIG_NETLABEL)         += netlabel/
+obj-$(CONFIG_IUCV)             += iucv/
 
 ifeq ($(CONFIG_NET),y)
 obj-$(CONFIG_SYSCTL)           += sysctl_net.o