[kernel] r10736 - in dists/trunk/linux-2.6/debian: . config/amd64 config/i386

[Aurelien Jarno]

Author: aurel32
Date: Thu Mar  6 16:49:37 2008
New Revision: 10736

Log:
  * [i386, amd64] Set CONFIG_VIRTIO=m, CONFIG_VIRTIO_RING=m, 
    CONFIG_VIRTIO_BLK=m, CONFIG_VIRTIO_NET=m, CONFIG_VIRTIO_CONSOLE=m.



Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/amd64/config
   dists/trunk/linux-2.6/debian/config/i386/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Mar  6 16:49:37 2008
@@ -51,6 +51,8 @@
   [ Aurelien Jarno ]
   * [mips/mipsel] Enable CONFIG_NO_HZ, CONFIG_HIGH_RES_TIMERS for dynticks
     and true high-resolution timers on 4kc-malta and 5kc-malta flavours.
+  * [i386, amd64] Set CONFIG_VIRTIO=m, CONFIG_VIRTIO_RING=m, 
+    CONFIG_VIRTIO_BLK=m, CONFIG_VIRTIO_NET=m, CONFIG_VIRTIO_CONSOLE=m.
 
   [ Bastian Blank ]
   * Remove binary only firmwares for:

Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config	(original)
+++ dists/trunk/linux-2.6/debian/config/amd64/config	Thu Mar  6 16:49:37 2008
@@ -232,6 +232,7 @@
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_VIRTIO_BLK=m
 CONFIG_IDE=m
 CONFIG_BLK_DEV_IDE=m
 # CONFIG_BLK_DEV_IDE_SATA is not set
@@ -349,6 +350,7 @@
 CONFIG_NETPOLL=y
 # CONFIG_NETPOLL_TRAP is not set
 CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_VIRTIO_NET=m
 CONFIG_HAMRADIO=y
 CONFIG_AX25=m
 # CONFIG_AX25_DAMA_SLAVE is not set
@@ -732,6 +734,7 @@
 CONFIG_SERIAL_JSM=m
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
+CONFIG_VIRTIO_CONSOLE=m
 CONFIG_PPDEV=m
 CONFIG_IPMI_HANDLER=m
 # CONFIG_IPMI_PANIC_EVENT is not set
@@ -1256,6 +1259,8 @@
 # CONFIG_HZ_300 is not set
 # CONFIG_MCORE2 is not set
 CONFIG_KVM_AMD=m
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_RING=m
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_BALLOON=m
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set

Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config	(original)
+++ dists/trunk/linux-2.6/debian/config/i386/config	Thu Mar  6 16:49:37 2008
@@ -898,6 +898,7 @@
 CONFIG_SERIAL_JSM=m
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
+CONFIG_VIRTIO_CONSOLE=m
 CONFIG_PPDEV=m
 CONFIG_IPMI_HANDLER=m
 # CONFIG_IPMI_PANIC_EVENT is not set
@@ -1496,6 +1497,8 @@
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_RING=m
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_LGUEST=m