summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthompsa <thompsa@FreeBSD.org>2007-05-31 19:47:39 +0000
committerthompsa <thompsa@FreeBSD.org>2007-05-31 19:47:39 +0000
commitabd2ba58f25dddb885bfecb62c626cf50543a2c8 (patch)
tree6ecc2c12b2231a10b22144400ecbf88611423ffd
parentb5a7cab3ba8571b11307ccdf9f85c2a5408aa1d0 (diff)
downloadFreeBSD-src-abd2ba58f25dddb885bfecb62c626cf50543a2c8.zip
FreeBSD-src-abd2ba58f25dddb885bfecb62c626cf50543a2c8.tar.gz
Take back the name 'bridge' now that we are the one and only. This can be
phased back in over the next few major releases. if_bridge is still the documented device name so nothing has changed yet.
-rw-r--r--sys/conf/files4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/conf/files b/sys/conf/files
index 632ffb9..4f420a9 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1558,13 +1558,13 @@ libkern/strvalid.c standard
net/bpf.c standard
net/bpf_jitter.c optional bpf_jitter
net/bpf_filter.c optional bpf | netgraph_bpf
-net/bridgestp.c optional if_bridge
+net/bridgestp.c optional bridge | if_bridge
net/bsd_comp.c optional ppp_bsdcomp
net/ieee8023ad_lacp.c optional lagg
net/if.c standard
net/if_arcsubr.c optional arcnet
net/if_atmsubr.c optional atm
-net/if_bridge.c optional if_bridge
+net/if_bridge.c optional bridge | if_bridge
net/if_clone.c standard
net/if_disc.c optional disc
net/if_edsc.c optional edsc
OpenPOWER on IntegriCloud