diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 19:11:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 19:11:49 -0700 |
| commit | 832fe9c222c7d431c2bff5765a0ac61bcb3df8c8 (patch) | |
| tree | ce4a482723db61955c47a028b14e3227d290d3be /arch/s390/Kconfig | |
| parent | ed9559d38a87a44e3bda87d73a50aab92471d7dc (diff) | |
| parent | e34f87256794b87e7f4a8f1812538be7b7b5214c (diff) | |
| download | kernel_goldelico_gta04-832fe9c222c7d431c2bff5765a0ac61bcb3df8c8.zip kernel_goldelico_gta04-832fe9c222c7d431c2bff5765a0ac61bcb3df8c8.tar.gz kernel_goldelico_gta04-832fe9c222c7d431c2bff5765a0ac61bcb3df8c8.tar.bz2 | |
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:
virtio: Add transport feature handling stub for virtio_ring.
virtio: Rename set_features to finalize_features
virtio: Formally reserve bits 28-31 to be 'transport' features.
s390: use virtio_console for KVM on s390
virtio: console as a config option
virtio_console: use virtqueue notification for hvc_console
hvc_console: rework setup to replace irq functions with callbacks
virtio_blk: check for hardsector size from host
virtio: Use bus_type probe and remove methods
virtio: don't always force a notification when ring is full
virtio: clarify that ABI is usable by any implementations
virtio: Recycle unused recv buffer pages for large skbs in net driver
virtio net: Allow receiving SG packets
virtio net: Add ethtool ops for SG/GSO
virtio: fix virtio_net xmit of freed skb bug
Diffstat (limited to 'arch/s390/Kconfig')
| -rw-r--r-- | arch/s390/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index eb530b4..2ed8812 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -565,6 +565,7 @@ bool "s390 guest support (EXPERIMENTAL)" depends on 64BIT && EXPERIMENTAL select VIRTIO select VIRTIO_RING + select VIRTIO_CONSOLE help Select this option if you want to run the kernel under s390 linux endmenu |