---

yaml --- r: 233892 b: refs/heads/master c: dcbcdf2 h: refs/heads/master v: v3
git-mirror · Mar 10, 2011 · d9ce17a · d9ce17a
1 parent 88988e4
commit d9ce17a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7343ff31ebf01691ea4515d3126467434b9d22d6
+refs/heads/master: dcbcdf22f500ac6e4ec06485341024739b9dc241
diff --git a/trunk/net/bridge/Kconfig b/trunk/net/bridge/Kconfig
@@ -6,6 +6,7 @@ config BRIDGE
 	tristate "802.1d Ethernet Bridging"
 	select LLC
 	select STP
+	depends on IPV6 || IPV6=n
 	---help---
 	  If you say Y here, then your Linux box will be able to act as an
 	  Ethernet bridge, which means that the different Ethernet segments it