net: fix a build failure when !CONFIG_PROC_FS
authorCong Wang <xiyou.wangcong@gmail.com>
Tue, 19 Feb 2013 02:47:05 +0000 (02:47 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 19 Feb 2013 18:18:13 +0000 (13:18 -0500)
commitcd0615746ba0f6643fb984345ae6ee0b73404ca6
treef55557971fec403884c37cf28326c28c7670b4cd
parent082c7ca42b0bf33aa3fb5eeb619dfbcfaa20d216
net: fix a build failure when !CONFIG_PROC_FS

When !CONFIG_PROC_FS dev_mcast_init() is not defined,
actually we can just merge dev_mcast_init() into
dev_proc_init().

Reported-by: Gao feng <gaofeng@cn.fujitsu.com>
Cc: Gao feng <gaofeng@cn.fujitsu.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/netdevice.h
net/core/dev.c
net/core/net-procfs.c