Signed-off-by: Simon Horman <horms@verge.net.au>

--- 

* Compile tested only

Index: linux-2.6/drivers/staging/ovs-datapath/actions.c
===================================================================
--- linux-2.6.orig/drivers/staging/ovs-datapath/actions.c	2010-08-25 12:22:15.000000000 +0900
+++ linux-2.6/drivers/staging/ovs-datapath/actions.c	2010-08-25 12:22:15.000000000 +0900
@@ -21,7 +21,7 @@
 
 #include "actions.h"
 #include "datapath.h"
-#include "openvswitch/datapath-protocol.h"
+#include "include/openvswitch/datapath-protocol.h"
 #include "vport.h"
 
 static struct sk_buff *make_writable(struct sk_buff *skb, unsigned min_headroom, gfp_t gfp)
Index: linux-2.6/drivers/staging/ovs-datapath/flow.h
===================================================================
--- linux-2.6.orig/drivers/staging/ovs-datapath/flow.h	2010-08-25 12:22:15.000000000 +0900
+++ linux-2.6/drivers/staging/ovs-datapath/flow.h	2010-08-25 12:22:15.000000000 +0900
@@ -17,7 +17,7 @@
 #include <linux/jiffies.h>
 #include <linux/time.h>
 
-#include "openvswitch/datapath-protocol.h"
+#include "include/openvswitch/datapath-protocol.h"
 #include "table.h"
 
 struct sk_buff;
Index: linux-2.6/drivers/staging/ovs-datapath/vport.h
===================================================================
--- linux-2.6.orig/drivers/staging/ovs-datapath/vport.h	2010-08-25 12:22:15.000000000 +0900
+++ linux-2.6/drivers/staging/ovs-datapath/vport.h	2010-08-25 12:22:15.000000000 +0900
@@ -15,7 +15,7 @@
 #include <linux/spinlock.h>
 
 #include "datapath.h"
-#include "openvswitch/datapath-protocol.h"
+#include "include/openvswitch/datapath-protocol.h"
 #include "odp-compat.h"
 
 struct vport;
Index: linux-2.6/drivers/staging/ovs-datapath/datapath.c
===================================================================
--- linux-2.6.orig/drivers/staging/ovs-datapath/datapath.c	2010-08-25 12:22:15.000000000 +0900
+++ linux-2.6/drivers/staging/ovs-datapath/datapath.c	2010-08-25 12:22:15.000000000 +0900
@@ -43,7 +43,7 @@
 #include <net/inet_ecn.h>
 #include <linux/compat.h>
 
-#include "openvswitch/datapath-protocol.h"
+#include "include/openvswitch/datapath-protocol.h"
 #include "datapath.h"
 #include "actions.h"
 #include "flow.h"
@@ -51,9 +51,6 @@
 #include "table.h"
 #include "vport-internal_dev.h"
 
-#include "compat.h"
-
-
 int (*dp_ioctl_hook)(struct net_device *dev, struct ifreq *rq, int cmd);
 EXPORT_SYMBOL(dp_ioctl_hook);
 
Index: linux-2.6/drivers/staging/ovs-datapath/flow.c
===================================================================
--- linux-2.6.orig/drivers/staging/ovs-datapath/flow.c	2010-08-25 12:22:15.000000000 +0900
+++ linux-2.6/drivers/staging/ovs-datapath/flow.c	2010-08-25 12:22:15.000000000 +0900
@@ -29,8 +29,6 @@
 #include <net/inet_ecn.h>
 #include <net/ip.h>
 
-#include "compat.h"
-
 struct kmem_cache *flow_cache;
 static unsigned int hash_seed;
 
Index: linux-2.6/drivers/staging/ovs-datapath/tunnel.h
===================================================================
--- linux-2.6.orig/drivers/staging/ovs-datapath/tunnel.h	2010-08-25 12:22:15.000000000 +0900
+++ linux-2.6/drivers/staging/ovs-datapath/tunnel.h	2010-08-25 12:22:15.000000000 +0900
@@ -9,7 +9,7 @@
 #ifndef TUNNEL_H
 #define TUNNEL_H 1
 
-#include "openvswitch/tunnel.h"
+#include "include/openvswitch/tunnel.h"
 #include "table.h"
 #include "vport.h"
 
Index: linux-2.6/drivers/staging/ovs-datapath/vport-netdev.c
===================================================================
--- linux-2.6.orig/drivers/staging/ovs-datapath/vport-netdev.c	2010-08-25 12:23:06.000000000 +0900
+++ linux-2.6/drivers/staging/ovs-datapath/vport-netdev.c	2010-08-25 12:23:19.000000000 +0900
@@ -20,8 +20,6 @@
 #include "vport-internal_dev.h"
 #include "vport-netdev.h"
 
-#include "compat.h"
-
 /* If the native device stats aren't 64 bit use the vport stats tracking instead. */
 #define USE_VPORT_STATS (sizeof(((struct net_device_stats *)0)->rx_bytes) < sizeof(u64))
 



