diff --git a/[refs] b/[refs]
index 87494ed5dab5..279bca555f27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1490fd89474dab9c560d3cca1a4aefbdb89be247
+refs/heads/master: e04af024b2e74249990587e76ec98220028c01c3
diff --git a/trunk/include/net/netns/x_tables.h b/trunk/include/net/netns/x_tables.h
index 9554a644a8f8..591db7d657a3 100644
--- a/trunk/include/net/netns/x_tables.h
+++ b/trunk/include/net/netns/x_tables.h
@@ -8,8 +8,11 @@ struct ebt_table;
 
 struct netns_xt {
 	struct list_head tables[NFPROTO_NUMPROTO];
+#if defined(CONFIG_BRIDGE_NF_EBTABLES) || \
+    defined(CONFIG_BRIDGE_NF_EBTABLES_MODULE)
 	struct ebt_table *broute_table;
 	struct ebt_table *frame_filter;
 	struct ebt_table *frame_nat;
+#endif
 };
 #endif