[PATCH] UBUNTU: Enable virtio modules for all i386 and amd64 flavours

[Soren Hansen]

Signed-off-by: Soren Hansen <soren at ubuntu.com>
---
 debian/config/amd64/config        |    7 +++++++
 debian/config/i386/config         |    7 +++++++
 debian/config/i386/config.386     |    5 -----
 debian/config/i386/config.generic |    5 -----
 debian/config/i386/config.virtual |    5 -----
 5 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index acd3000..907c276 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -965,6 +965,7 @@ CONFIG_HW_CONSOLE=y
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_AMD=m
 CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_VIRTIO=m
 # CONFIG_HZ_1000 is not set
 # CONFIG_HZ_300 is not set
 CONFIG_I2C=m
@@ -1688,6 +1689,7 @@ CONFIG_NETXEN_NIC=m
 CONFIG_NET_9P=m
 # CONFIG_NET_9P_DEBUG is not set
 CONFIG_NET_9P_FD=m
+CONFIG_NET_9P_VIRTIO=m
 CONFIG_NET_ACT_GACT=m
 CONFIG_NET_ACT_IPT=m
 CONFIG_NET_ACT_MIRRED=m
@@ -3000,6 +3002,11 @@ CONFIG_VIDEO_ZORAN_DC30=m
 CONFIG_VIDEO_ZORAN_LML33=m
 CONFIG_VIDEO_ZORAN_LML33R10=m
 CONFIG_VIDEO_ZORAN_ZR36060=m
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_BLK=m
+CONFIG_VIRTIO_NET=m
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_RING=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_VIRT_TO_BUS=y
 CONFIG_VITESSE_PHY=m
diff --git a/debian/config/i386/config b/debian/config/i386/config
index 38e618b..2e93fd6 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -416,6 +416,7 @@ CONFIG_HT_IRQ=y
 CONFIG_HVC_DRIVER=y
 CONFIG_HW_CONSOLE=y
 CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_VIRTIO=m
 # CONFIG_HZ_1000 is not set
 # CONFIG_HZ_300 is not set
 CONFIG_I2C=m
@@ -728,6 +729,7 @@ CONFIG_NETWORK_SECMARK=y
 CONFIG_NET_9P=m
 # CONFIG_NET_9P_DEBUG is not set
 CONFIG_NET_9P_FD=m
+CONFIG_NET_9P_VIRTIO=m
 CONFIG_NET_ACT_GACT=m
 CONFIG_NET_ACT_IPT=m
 CONFIG_NET_ACT_MIRRED=m
@@ -1221,6 +1223,11 @@ CONFIG_VGASTATE=m
 CONFIG_VGA_CONSOLE=y
 CONFIG_VIDEO_OUTPUT_CONTROL=m
 CONFIG_VIDEO_SELECT=y
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_BLK=m
+CONFIG_VIRTIO_NET=m
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_RING=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_VIRT_TO_BUS=y
 CONFIG_VLAN_8021Q=m
diff --git a/debian/config/i386/config.386 b/debian/config/i386/config.386
index 9388594..7f69e2f 100644
--- a/debian/config/i386/config.386
+++ b/debian/config/i386/config.386
@@ -1099,7 +1099,6 @@ CONFIG_NE3210=m
 # CONFIG_NETLABEL is not set
 CONFIG_NETROM=m
 CONFIG_NETXEN_NIC=m
-CONFIG_NET_9P_VIRTIO=m
 CONFIG_NET_ACT_POLICE=m
 CONFIG_NET_ACT_SIMP=m
 # CONFIG_NET_CLS_POLICE is not set
@@ -2048,11 +2047,7 @@ CONFIG_VIDEO_ZORAN_DC30=m
 CONFIG_VIDEO_ZORAN_LML33=m
 CONFIG_VIDEO_ZORAN_LML33R10=m
 CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_BLK=m
 CONFIG_VIRTIO_CONSOLE=y
-CONFIG_VIRTIO_NET=m
-CONFIG_VIRTIO_RING=y
 CONFIG_VITESSE_PHY=m
 CONFIG_VLSI_FIR=m
 CONFIG_VORTEX=m
diff --git a/debian/config/i386/config.generic b/debian/config/i386/config.generic
index 7ae518b..bc487c0 100644
--- a/debian/config/i386/config.generic
+++ b/debian/config/i386/config.generic
@@ -1095,7 +1095,6 @@ CONFIG_NE3210=m
 # CONFIG_NETLABEL is not set
 CONFIG_NETROM=m
 CONFIG_NETXEN_NIC=m
-CONFIG_NET_9P_VIRTIO=m
 CONFIG_NET_ACT_POLICE=m
 CONFIG_NET_ACT_SIMP=m
 # CONFIG_NET_CLS_POLICE is not set
@@ -2044,11 +2043,7 @@ CONFIG_VIDEO_ZORAN_DC30=m
 CONFIG_VIDEO_ZORAN_LML33=m
 CONFIG_VIDEO_ZORAN_LML33R10=m
 CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_BLK=m
 CONFIG_VIRTIO_CONSOLE=y
-CONFIG_VIRTIO_NET=m
-CONFIG_VIRTIO_RING=y
 CONFIG_VITESSE_PHY=m
 CONFIG_VLSI_FIR=m
 CONFIG_VORTEX=m
diff --git a/debian/config/i386/config.virtual b/debian/config/i386/config.virtual
index 3d8cd38..8a24096 100644
--- a/debian/config/i386/config.virtual
+++ b/debian/config/i386/config.virtual
@@ -271,7 +271,6 @@ CONFIG_M586=y
 # CONFIG_NCP_FS is not set
 # CONFIG_NETLABEL is not set
 # CONFIG_NETXEN_NIC is not set
-CONFIG_NET_9P_VIRTIO=m
 CONFIG_NET_ACT_POLICE=y
 # CONFIG_NET_ACT_SIMP is not set
 CONFIG_NET_CLS_POLICE=y
@@ -564,11 +563,7 @@ CONFIG_VERSION_SIGNATURE="Ubuntu 2.6.24-4.6-virtual"
 # CONFIG_VIA_RHINE is not set
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_VIDEO_DEV is not set
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_BLK=m
 CONFIG_VIRTIO_CONSOLE=y
-CONFIG_VIRTIO_NET=m
-CONFIG_VIRTIO_RING=y
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_W1_MASTER_DS2482 is not set
 # CONFIG_W1_MASTER_DS2490 is not set
-- 
1.5.3.7