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

[Bastian Blank]

Author: waldi
Date: Mon Mar 16 22:30:43 2009
New Revision: 13141

Log:
debian/config: Centralize virtio devices.


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

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	Mon Mar 16 22:30:43 2009
@@ -207,7 +207,6 @@
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_XEN_BLKDEV_FRONTEND=m
-CONFIG_VIRTIO_BLK=m
 
 ##
 ## file: drivers/block/paride/Kconfig
@@ -884,7 +883,6 @@
 CONFIG_NET_FC=y
 CONFIG_NETCONSOLE=m
 # CONFIG_NETPOLL_TRAP is not set
-CONFIG_VIRTIO_NET=m
 
 ##
 ## file: drivers/net/arcnet/Kconfig
@@ -1318,12 +1316,6 @@
 # CONFIG_LOGO is not set
 
 ##
-## file: drivers/virtio/Kconfig
-##
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BALLOON=m
-
-##
 ## file: drivers/watchdog/Kconfig
 ##
 CONFIG_WATCHDOG=y

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	(original)
+++ dists/trunk/linux-2.6/debian/config/config	Mon Mar 16 22:30:43 2009
@@ -187,6 +187,7 @@
 CONFIG_BLK_DEV_RAM_COUNT=16
 # CONFIG_BLK_DEV_XIP is not set
 CONFIG_ATA_OVER_ETH=m
+CONFIG_VIRTIO_BLK=m
 # CONFIG_BLK_DEV_HD is not set
 
 ##
@@ -1273,6 +1274,7 @@
 CONFIG_SLIP_SMART=y
 CONFIG_SLIP_MODE_SLIP6=y
 CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_VIRTIO_NET=m
 
 ##
 ## file: drivers/net/appletalk/Kconfig
@@ -2139,6 +2141,12 @@
 CONFIG_DISPLAY_SUPPORT=m
 
 ##
+## file: drivers/virtio/Kconfig
+##
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
+
+##
 ## file: drivers/w1/Kconfig
 ##
 CONFIG_W1=m

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	Mon Mar 16 22:30:43 2009
@@ -280,7 +280,6 @@
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_XEN_BLKDEV_FRONTEND=m
-CONFIG_VIRTIO_BLK=m
 
 ##
 ## file: drivers/block/paride/Kconfig
@@ -1067,7 +1066,6 @@
 CONFIG_NET_FC=y
 CONFIG_NETCONSOLE=m
 # CONFIG_NETPOLL_TRAP is not set
-CONFIG_VIRTIO_NET=m
 
 ##
 ## file: drivers/net/arcnet/Kconfig
@@ -1560,12 +1558,6 @@
 # CONFIG_LOGO is not set
 
 ##
-## file: drivers/virtio/Kconfig
-##
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BALLOON=m
-
-##
 ## file: drivers/watchdog/Kconfig
 ##
 CONFIG_WATCHDOG=y

Modified: dists/trunk/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config	(original)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config	Mon Mar 16 22:30:43 2009
@@ -114,7 +114,6 @@
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_VIRTIO_BLK=m
 
 ##
 ## file: drivers/bluetooth/Kconfig
@@ -550,7 +549,6 @@
 CONFIG_NET_FC=y
 CONFIG_NETCONSOLE=m
 CONFIG_NETPOLL_TRAP=y
-CONFIG_VIRTIO_NET=m
 
 ##
 ## file: drivers/net/arcnet/Kconfig
@@ -907,12 +905,6 @@
 # CONFIG_LOGO_LINUX_CLUT224 is not set
 
 ##
-## file: drivers/virtio/Kconfig
-##
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BALLOON=m
-
-##
 ## file: drivers/watchdog/Kconfig
 ##
 CONFIG_WATCHDOG=y