[kernel] r19203 - in dists/trunk/linux/debian: . config/armel

[Arnaud Patard]

Author: rtp-guest
Date: Sun Jun 24 22:39:13 2012
New Revision: 19203

Log:
disable virtio on all armel platforms except versatile

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/armel/config
   dists/trunk/linux/debian/config/armel/config.versatile

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Sun Jun 24 22:28:33 2012	(r19202)
+++ dists/trunk/linux/debian/changelog	Sun Jun 24 22:39:13 2012	(r19203)
@@ -17,6 +17,7 @@
   [ Arnaud Patard ]
   * [armel] disable FIPS, VGA_ARB, FTRACE on iop32x and ixp4xx to reduce
   kernel size.
+  * [armel] disable virtio modules on all platforms except versatile
 
  -- Ben Hutchings <ben at decadent.org.uk>  Thu, 07 Jun 2012 04:45:03 +0100
 

Modified: dists/trunk/linux/debian/config/armel/config
==============================================================================
--- dists/trunk/linux/debian/config/armel/config	Sun Jun 24 22:28:33 2012	(r19202)
+++ dists/trunk/linux/debian/config/armel/config	Sun Jun 24 22:39:13 2012	(r19203)
@@ -57,6 +57,10 @@
 # CONFIG_PARPORT_PC is not set
 
 ##
+## file: drivers/pci/Kconfig
+# CONFIG_PCI_IOV is not set
+
+##
 ## file: drivers/scsi/Kconfig
 ##
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
@@ -114,3 +118,9 @@
 ##
 # CONFIG_SECURITY_TOMOYO is not set
 
+##
+## file: drivers/virtio/Kconfig
+##
+# CONFIG_VIRTIO_PCI is not set
+# CONFIG_VIRTIO_BALLOON is not set
+

Modified: dists/trunk/linux/debian/config/armel/config.versatile
==============================================================================
--- dists/trunk/linux/debian/config/armel/config.versatile	Sun Jun 24 22:28:33 2012	(r19202)
+++ dists/trunk/linux/debian/config/armel/config.versatile	Sun Jun 24 22:39:13 2012	(r19203)
@@ -340,6 +340,10 @@
 # CONFIG_MDIO_BITBANG is not set
 
 ##
+## file: drivers/pci/Kconfig
+CONFIG_PCI_IOV=y
+
+##
 ## file: drivers/pcmcia/Kconfig
 ##
 # CONFIG_PCCARD is not set
@@ -456,6 +460,12 @@
 CONFIG_DISPLAY_SUPPORT=m
 
 ##
+## file: drivers/virtio/Kconfig
+##
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_BALLOON=y
+
+##
 ## file: kernel/Kconfig.preempt
 ##
 ## choice: Preemption Model