summaryrefslogtreecommitdiffstats
path: root/net/bridge/Makefile
diff options
context:
space:
mode:
authorCong Wang <xiyou.wangcong@gmail.com>2014-05-21 02:30:00 +0200
committerDavid S. Miller <davem@davemloft.net>2014-05-22 21:33:47 +0200
commitb1282726d53465c7362eb134eb335173e8cd5b8c (patch)
treeb8add1f37fa1d12ce7d3e6cc230b54560c23c978 /net/bridge/Makefile
parentnet/dccp/timer.c: use 'u64' instead of 's64' to avoid compiler's warning (diff)
downloadlinux-b1282726d53465c7362eb134eb335173e8cd5b8c.tar.xz
linux-b1282726d53465c7362eb134eb335173e8cd5b8c.zip
bridge: make br_device_notifier static
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>
Diffstat (limited to 'net/bridge/Makefile')
-rw-r--r--net/bridge/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/Makefile b/net/bridge/Makefile
index 906a18b4e74a..29b6e2a8ca9e 100644
--- a/net/bridge/Makefile
+++ b/net/bridge/Makefile
@@ -5,7 +5,7 @@
obj-$(CONFIG_BRIDGE) += bridge.o
bridge-y := br.o br_device.o br_fdb.o br_forward.o br_if.o br_input.o \
- br_ioctl.o br_notify.o br_stp.o br_stp_bpdu.o \
+ br_ioctl.o br_stp.o br_stp_bpdu.o \
br_stp_if.o br_stp_timer.o br_netlink.o
bridge-$(CONFIG_SYSFS) += br_sysfs_if.o br_sysfs_br.o