diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-23 07:35:16 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-23 07:35:16 +0900 |
| commit | 964fe080d94db82a3268443e9b9ece4c60246414 (patch) | |
| tree | d0095a9befb34f77bf32757e7465e5d2cbc40a93 /net | |
| parent | 4848490c50c5d46d4e9749fddc374c303823bcc4 (diff) | |
| parent | ff07eb897a97640b7ac0262cd50311ad403038f8 (diff) | |
| download | linux-3.10-964fe080d94db82a3268443e9b9ece4c60246414.tar.gz linux-3.10-964fe080d94db82a3268443e9b9ece4c60246414.tar.bz2 linux-3.10-964fe080d94db82a3268443e9b9ece4c60246414.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
move virtrng_remove to .devexit.text
move virtballoon_remove to .devexit.text
virtio_blk: Revert serial number support
virtio: let header files include virtio_ids.h
virtio_blk: revert QUEUE_FLAG_VIRT addition
Diffstat (limited to 'net')
| -rw-r--r-- | net/9p/trans_virtio.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c index b2e07f0dd29..ea1e3daabef 100644 --- a/net/9p/trans_virtio.c +++ b/net/9p/trans_virtio.c @@ -43,7 +43,6 @@ #include <net/9p/transport.h> #include <linux/scatterlist.h> #include <linux/virtio.h> -#include <linux/virtio_ids.h> #include <linux/virtio_9p.h> #define VIRTQUEUE_NUM 128 |