summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-23 00:35:16 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-23 00:35:16 +0200
commit964fe080d94db82a3268443e9b9ece4c60246414 (patch)
treed0095a9befb34f77bf32757e7465e5d2cbc40a93 /net
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parentmove virtrng_remove to .devexit.text (diff)
downloadlinux-964fe080d94db82a3268443e9b9ece4c60246414.tar.xz
linux-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.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index b2e07f0dd298..ea1e3daabefe 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