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

[Maximilian Attems]

Author: maks
Date: Tue Jan 15 11:13:19 2008
New Revision: 10106

Log:
i386 enable VIRTIO_NET and VIRTIO_BLK


Modified:
   dists/trunk/linux-2.6/debian/changelog
   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	Tue Jan 15 11:13:19 2008
@@ -22,7 +22,7 @@
   * Disable bcm43xx, deprecated by upstream. Enable B43 (needs v4 firmware)
     and B43LEGACY (needs v3 firmware).
   * [i386]: Set SND_SC6000, EDAC_I3000, EDAC_I5000, SBC7240_WDT,
-    NET_9P_VIRTIO, FB_GEODE_LX.
+    NET_9P_VIRTIO, FB_GEODE_LX, VIRTIO_NET, VIRTIO_BLK.
   * Set USB_EHCI_TT_NEWSCHED fills USB 2.0 bandwith better. (closes: #454797)
   * postrm: Nuke initramfs sha1sum on linux-image removal. (closes: #420245)
   * Unifiy BSD_PROCESS_ACCT settings across configs. (closes: #455892)
@@ -66,7 +66,7 @@
   * [m68k]: Update patches from linux-m68k CVS
   * [m68k]: Enable building for bvme6000, mvme147, and mvme16x again
 
- -- maximilian attems <maks at debian.org>  Mon, 14 Jan 2008 17:43:51 +0100
+ -- maximilian attems <maks at debian.org>  Tue, 15 Jan 2008 12:05:26 +0100
 
 linux-2.6 (2.6.23-1~experimental.1) UNRELEASED; urgency=low
 

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	Tue Jan 15 11:13:19 2008
@@ -286,6 +286,7 @@
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_ATA_OVER_ETH=m
+CONFIG_VIRTIO_BLK=m
 CONFIG_IDE=m
 CONFIG_BLK_DEV_IDE=m
 # CONFIG_BLK_DEV_IDE_SATA is not set
@@ -704,6 +705,7 @@
 CONFIG_NET_FC=y
 CONFIG_SHAPER=m
 CONFIG_NETCONSOLE=m
+CONFIG_VIRTIO_NET=m
 CONFIG_ISDN=m
 CONFIG_ISDN_I4L=m
 CONFIG_ISDN_PPP=y