aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian.master/config/amd64/config.common.amd641
-rw-r--r--debian.master/config/config.common.ubuntu1
-rw-r--r--debian.master/config/i386/config.common.i3861
-rw-r--r--debian.master/config/powerpc/config.common.powerpc1
-rw-r--r--debian.master/config/ppc64/config.common.ppc641
5 files changed, 1 insertions, 4 deletions
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index b0e022940bf..b2311dbd234 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -161,7 +161,6 @@ CONFIG_VIRTIO_MMIO=m
CONFIG_VIRTIO_NET=y
CONFIG_VIRTIO_PCI=y
CONFIG_VIRTIO_RING=y
-CONFIG_VME_BUS=m
CONFIG_VT_HW_CONSOLE_BINDING=y
CONFIG_W35UND=m
CONFIG_WIMAX_I2400M_SDIO=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 06777efaf83..d79b5d7cce2 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -6247,6 +6247,7 @@ CONFIG_VLAN_8021Q=m
CONFIG_VLAN_8021Q_GVRP=y
CONFIG_VLSI_FIR=m
CONFIG_VM86=y
+CONFIG_VME_BUS=m
CONFIG_VME_CA91CX42=m
CONFIG_VME_PIO2=m
CONFIG_VME_TSI148=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index a8b260c2e6d..893e707535d 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -161,7 +161,6 @@ CONFIG_VIRTIO_MMIO=m
CONFIG_VIRTIO_NET=y
CONFIG_VIRTIO_PCI=y
CONFIG_VIRTIO_RING=y
-CONFIG_VME_BUS=m
CONFIG_VT_HW_CONSOLE_BINDING=y
CONFIG_W35UND=m
CONFIG_WIMAX_I2400M_SDIO=m
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 57111ab1eaa..1c6e5c06e46 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -153,7 +153,6 @@ CONFIG_VIRTIO_MMIO=m
CONFIG_VIRTIO_NET=m
CONFIG_VIRTIO_PCI=m
CONFIG_VIRTIO_RING=m
-# CONFIG_VME_BUS is not set
CONFIG_VT_HW_CONSOLE_BINDING=y
# CONFIG_W35UND is not set
CONFIG_WIMAX_I2400M_SDIO=m
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index d07ac806b79..d15ea485ad0 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -187,7 +187,6 @@ CONFIG_VIRTIO_MMIO=m
CONFIG_VIRTIO_NET=m
CONFIG_VIRTIO_PCI=m
CONFIG_VIRTIO_RING=m
-# CONFIG_VME_BUS is not set
CONFIG_VT_HW_CONSOLE_BINDING=y
# CONFIG_W35UND is not set
CONFIG_WIMAX_I2400M_SDIO=m