diff options
| author | Linus Torvalds | 2009-09-23 18:23:45 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2009-09-23 18:23:45 +0200 |
| commit | 1f0918d03ff4b5c94540c71ce889672abdbc2f4a (patch) | |
| tree | ecee710444fb3405da55933501e339e10e4ac880 /include/linux/virtio_rng.h | |
| parent | nommu: fix two build breakages (diff) | |
| parent | lguest: don't force VIRTIO_F_NOTIFY_ON_EMPTY (diff) | |
| download | kernel-qcow2-linux-1f0918d03ff4b5c94540c71ce889672abdbc2f4a.tar.gz kernel-qcow2-linux-1f0918d03ff4b5c94540c71ce889672abdbc2f4a.tar.xz kernel-qcow2-linux-1f0918d03ff4b5c94540c71ce889672abdbc2f4a.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:
lguest: don't force VIRTIO_F_NOTIFY_ON_EMPTY
lguest: cleanup for map_switcher()
lguest: use PGDIR_SHIFT for PAE code to allow different PAGE_OFFSET
lguest: use set_pte/set_pmd uniformly for real page table entries
lguest: move panic notifier registration to its expected place.
virtio_blk: add support for cache flush
virtio: add virtio IDs file
virtio: get rid of redundant VIRTIO_ID_9P definition
virtio: make add_buf return capacity remaining
virtio_pci: minor MSI-X cleanups
Diffstat (limited to 'include/linux/virtio_rng.h')
| -rw-r--r-- | include/linux/virtio_rng.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/virtio_rng.h b/include/linux/virtio_rng.h index 1a85dab8a940..48121c3c434b 100644 --- a/include/linux/virtio_rng.h +++ b/include/linux/virtio_rng.h @@ -4,7 +4,4 @@ * compatible drivers/servers. */ #include <linux/virtio_config.h> -/* The ID for virtio_rng */ -#define VIRTIO_ID_RNG 4 - #endif /* _LINUX_VIRTIO_RNG_H */ |