diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-22 18:35:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-22 18:35:16 -0400 |
| commit | 964fe080d94db82a3268443e9b9ece4c60246414 (patch) | |
| tree | d0095a9befb34f77bf32757e7465e5d2cbc40a93 /Documentation | |
| parent | 4848490c50c5d46d4e9749fddc374c303823bcc4 (diff) | |
| parent | ff07eb897a97640b7ac0262cd50311ad403038f8 (diff) | |
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 'Documentation')
| -rw-r--r-- | Documentation/lguest/lguest.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/lguest/lguest.c b/Documentation/lguest/lguest.c index ba9373f82ab5..098de5bce00a 100644 --- a/Documentation/lguest/lguest.c +++ b/Documentation/lguest/lguest.c | |||
| @@ -42,7 +42,6 @@ | |||
| 42 | #include <signal.h> | 42 | #include <signal.h> |
| 43 | #include "linux/lguest_launcher.h" | 43 | #include "linux/lguest_launcher.h" |
| 44 | #include "linux/virtio_config.h" | 44 | #include "linux/virtio_config.h" |
| 45 | #include <linux/virtio_ids.h> | ||
| 46 | #include "linux/virtio_net.h" | 45 | #include "linux/virtio_net.h" |
| 47 | #include "linux/virtio_blk.h" | 46 | #include "linux/virtio_blk.h" |
| 48 | #include "linux/virtio_console.h" | 47 | #include "linux/virtio_console.h" |