diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-12-10 09:19:18 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-12-10 09:19:18 -0500 |
| commit | 2ade0c1d9d93b7642212657ef76f4a1e30233711 (patch) | |
| tree | 63bc720c0ffe5f4760cac4ed617b9870b050175e /include/linux/virtio_9p.h | |
| parent | 504499f22c08a03e2e19dc88d31aa0ecd2ac815e (diff) | |
| parent | 6313e3c21743cc88bb5bd8aa72948ee1e83937b6 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/linux/virtio_9p.h')
| -rw-r--r-- | include/linux/virtio_9p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/virtio_9p.h b/include/linux/virtio_9p.h index 1faa80d92f05..e68b439b2860 100644 --- a/include/linux/virtio_9p.h +++ b/include/linux/virtio_9p.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | #include <linux/types.h> | 5 | #include <linux/types.h> |
| 6 | #include <linux/virtio_ids.h> | 6 | #include <linux/virtio_ids.h> |
| 7 | #include <linux/virtio_config.h> | 7 | #include <linux/virtio_config.h> |
| 8 | #include <linux/types.h> | ||
| 9 | 8 | ||
| 10 | /* The feature bitmap for virtio 9P */ | 9 | /* The feature bitmap for virtio 9P */ |
| 11 | 10 | ||