From 5d3ee3838fef544489f461a65679e615357539c6 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Mon, 16 Mar 2009 22:30:43 +0000 Subject: [PATCH] debian/config: Centralize virtio devices. svn path=/dists/trunk/linux-2.6/; revision=13141 --- debian/config/amd64/config | 8 -------- debian/config/config | 8 ++++++++ debian/config/i386/config | 8 -------- debian/config/powerpc/config | 8 -------- 4 files changed, 8 insertions(+), 24 deletions(-) diff --git a/debian/config/amd64/config b/debian/config/amd64/config index ff195ee82..304c89e4a 100644 --- a/debian/config/amd64/config +++ b/debian/config/amd64/config @@ -207,7 +207,6 @@ CONFIG_CDROM_PKTCDVD=m 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_PLIP=m CONFIG_NET_FC=y CONFIG_NETCONSOLE=m # CONFIG_NETPOLL_TRAP is not set -CONFIG_VIRTIO_NET=m ## ## file: drivers/net/arcnet/Kconfig @@ -1317,12 +1315,6 @@ CONFIG_FONT_8x16=y ## # CONFIG_LOGO is not set -## -## file: drivers/virtio/Kconfig -## -CONFIG_VIRTIO_PCI=m -CONFIG_VIRTIO_BALLOON=m - ## ## file: drivers/watchdog/Kconfig ## diff --git a/debian/config/config b/debian/config/config index 00e1cf2d4..d8f9ad845 100644 --- a/debian/config/config +++ b/debian/config/config @@ -187,6 +187,7 @@ CONFIG_BLK_DEV_RAM=y 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_COMPRESSED=y CONFIG_SLIP_SMART=y CONFIG_SLIP_MODE_SLIP6=y CONFIG_NETCONSOLE_DYNAMIC=y +CONFIG_VIRTIO_NET=m ## ## file: drivers/net/appletalk/Kconfig @@ -2138,6 +2140,12 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y ## CONFIG_DISPLAY_SUPPORT=m +## +## file: drivers/virtio/Kconfig +## +CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_BALLOON=m + ## ## file: drivers/w1/Kconfig ## diff --git a/debian/config/i386/config b/debian/config/i386/config index 7f8472be3..e2d4f1426 100644 --- a/debian/config/i386/config +++ b/debian/config/i386/config @@ -280,7 +280,6 @@ CONFIG_CDROM_PKTCDVD=m 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_PLIP=m CONFIG_NET_FC=y CONFIG_NETCONSOLE=m # CONFIG_NETPOLL_TRAP is not set -CONFIG_VIRTIO_NET=m ## ## file: drivers/net/arcnet/Kconfig @@ -1559,12 +1557,6 @@ CONFIG_FB_GEODE_GX1=m ## # CONFIG_LOGO is not set -## -## file: drivers/virtio/Kconfig -## -CONFIG_VIRTIO_PCI=m -CONFIG_VIRTIO_BALLOON=m - ## ## file: drivers/watchdog/Kconfig ## diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index 4fc03b2af..b3da17cff 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -114,7 +114,6 @@ CONFIG_BLK_DEV_RAM_SIZE=8192 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_HIPPI=y CONFIG_NET_FC=y CONFIG_NETCONSOLE=m CONFIG_NETPOLL_TRAP=y -CONFIG_VIRTIO_NET=m ## ## file: drivers/net/arcnet/Kconfig @@ -906,12 +904,6 @@ CONFIG_LOGO=y CONFIG_LOGO_LINUX_VGA16=y # CONFIG_LOGO_LINUX_CLUT224 is not set -## -## file: drivers/virtio/Kconfig -## -CONFIG_VIRTIO_PCI=m -CONFIG_VIRTIO_BALLOON=m - ## ## file: drivers/watchdog/Kconfig ##