bridge: make br_device_notifier static
authorCong Wang <xiyou.wangcong@gmail.com>
Wed, 21 May 2014 00:30:00 +0000 (17:30 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 22 May 2014 19:33:47 +0000 (15:33 -0400)
Merge net/bridge/br_notify.c into net/bridge/br.c,
since it has only br_device_event() and br.c is small.

Cc: Stephen Hemminger <stephen@networkplumber.org>
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>
net/bridge/Makefile
net/bridge/br.c
net/bridge/br_notify.c [deleted file]
net/bridge/br_private.h

Simple merge
diff --cc net/bridge/br.c
Simple merge
diff --cc net/bridge/br_notify.c
Simple merge
Simple merge