From d9ce17a40743f64c6a58839fc0a879ead095704e Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Thu, 10 Mar 2011 13:45:57 -0800
Subject: [PATCH] --- yaml --- r: 233892 b: refs/heads/master c:
 dcbcdf22f500ac6e4ec06485341024739b9dc241 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/net/bridge/Kconfig | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a1fcd966c676..1cd38127c755 100644
--- 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
index 9190ae462cb4..6dee7bf648a9 100644
--- 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