Merge branch 'master' into tk71

[mv-sheeva.git] / include / linux / virtio_9p.h

diff --git a/include/linux/virtio_9p.h b/include/linux/virtio_9p.h
index 1faa80d92f05d14fe1c769ad5736b3f6065b0841..e68b439b2860e7aa5e9490fec542fdfe245c6b2f 100644 (file)
--- a/include/linux/virtio_9p.h
+++ b/include/linux/virtio_9p.h
@@ -5,7 +5,6 @@
 #include <linux/types.h>
 #include <linux/virtio_ids.h>
 #include <linux/virtio_config.h>
-#include <linux/types.h>
 
 /* The feature bitmap for virtio 9P */