Merge tag 'microblaze-v5.1-rc1' of git://git.monstr.eu/linux-2.6-microblaze

[linux-2.6-microblaze.git] / net / openvswitch / flow_table.h

diff --git a/net/openvswitch/flow_table.h b/net/openvswitch/flow_table.h
index 2dd9900..de5ec6c 100644 (file)
--- a/net/openvswitch/flow_table.h
+++ b/net/openvswitch/flow_table.h
@@ -29,7 +29,6 @@
 #include <linux/in6.h>
 #include <linux/jiffies.h>
 #include <linux/time.h>
-#include <linux/flex_array.h>
 
 #include <net/inet_ecn.h>
 #include <net/ip_tunnels.h>
@@ -37,7 +36,7 @@
 #include "flow.h"
 
 struct table_instance {
-       struct flex_array *buckets;
+       struct hlist_head *buckets;
        unsigned int n_buckets;
        struct rcu_head rcu;
        int node_ver;