Cong Wang cd0615746b 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>

2013-02-19 13:18:13 -05:00

..

acpi

PCI changes for the v3.8 merge window:

2012-12-13 12:14:47 -08:00

asm-generic

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

2013-01-23 13:31:15 -08:00

clocksource

…

crypto

crypto: cast5/cast6 - move lookup tables to shared module

2012-12-06 17:16:26 +08:00

drm

Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel

2013-01-11 07:52:48 +10:00

keys

…

linux

net: fix a build failure when !CONFIG_PROC_FS

2013-02-19 13:18:13 -05:00

math-emu

…

media

[media] V4L: Add driver for S3C24XX/S3C64XX SoC series camera interface

2012-11-28 09:43:34 -02:00

memory

…

misc

…

net

Merge branch 'master' of git://1984.lsi.us.es/nf-next

2013-02-18 23:42:09 -05:00

pcmcia

…

ras

…

rdma

UAPI: Remove empty Kbuild files

2013-01-02 17:36:10 -08:00

rxrpc

…

scsi

SCSI misc on 20121212

2012-12-13 19:20:31 -08:00

sound

Merge remote-tracking branch 'asoc/fix/cs4271' into tmp

2013-01-10 12:22:11 +00:00

target

target: Introduce TCM_NO_SENSE

2013-01-10 20:06:08 -08:00

trace

Various bug fixes for ext4. Perhaps the most serious bug fixed is one

2013-01-02 09:57:34 -08:00

uapi

Merge branch 'master' of git://1984.lsi.us.es/nf-next

2013-02-18 23:42:09 -05:00

video

Merge branch 'omap-for-v3.8/fixes-for-merge-window' into omap-for-v3.8/fixes-for-merge-window-v2

2012-12-16 11:28:10 -08:00

xen

Bugfixes:

2012-12-18 12:26:54 -08:00

Kbuild

UAPI: Remove empty Kbuild files

2013-01-02 17:36:10 -08:00