Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[pandora-kernel.git] / net / Makefile

diff --git a/net/Makefile b/net/Makefile
index a87a889..b7a1364 100644 (file)
--- a/net/Makefile
+++ b/net/Makefile
@@ -34,6 +34,7 @@ obj-$(CONFIG_LAPB)            += lapb/
 obj-$(CONFIG_NETROM)           += netrom/
 obj-$(CONFIG_ROSE)             += rose/
 obj-$(CONFIG_AX25)             += ax25/
+obj-$(CONFIG_CAN)              += can/
 obj-$(CONFIG_IRDA)             += irda/
 obj-$(CONFIG_BT)               += bluetooth/
 obj-$(CONFIG_SUNRPC)           += sunrpc/
@@ -51,6 +52,7 @@ obj-$(CONFIG_TIPC)            += tipc/
 obj-$(CONFIG_NETLABEL)         += netlabel/
 obj-$(CONFIG_IUCV)             += iucv/
 obj-$(CONFIG_RFKILL)           += rfkill/
+obj-$(CONFIG_NET_9P)           += 9p/
 
 ifeq ($(CONFIG_NET),y)
 obj-$(CONFIG_SYSCTL)           += sysctl_net.o