commit f73d725c1dbfe49e951a5191d994381896a9f323
author Daniel Mentz <danielmentz@google.com> Wed Feb 05 16:02:38 2014 -0800
committer Daniel Mentz <danielmentz@google.com> Fri Feb 07 14:05:54 2014 -0800
tree bebdbc951b316c217508c426669207f3ebb9585d
parent 82076b547b9b91ce958b6d20858f75c7f3f883ef

Disable BRIDGE_NETFILTER

Mindspeed's auto_bridge module is currently not compatible with
CONFIG_BRIDGE_NETFILTER. Also disable CONFIG_NETFILTER_XT_MATCH_PHYSDEV
because it depends on CONFIG_BRIDGE_NETFILTER.

Change-Id: I63405f75456f1c1b08144e4b01f30e198abeeefb

arch/arm/configs/gfrg200_defconfig

diff --git a/arch/arm/configs/gfrg200_defconfig b/arch/arm/configs/gfrg200_defconfig
index 91b33d5..0ddab17 100644
--- a/arch/arm/configs/gfrg200_defconfig
+++ b/arch/arm/configs/gfrg200_defconfig
@@ -72,6 +72,7 @@
 # CONFIG_INET6_XFRM_MODE_BEET is not set
 # CONFIG_IPV6_SIT is not set
 CONFIG_NETFILTER=y
+# CONFIG_BRIDGE_NETFILTER is not set
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CONNTRACK_FTP=m
@@ -104,7 +105,6 @@
 CONFIG_NETFILTER_XT_MATCH_MARK=m
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
 CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
 CONFIG_NETFILTER_XT_MATCH_QUOTA=m
 CONFIG_NETFILTER_XT_MATCH_RECENT=m