UBUNTU: [Config] CONFIG_SND_PCM_OSS=n using pulseaudio emulation instead

Signed-off-by: Andy Whitcroft <apw@canonical.com>

7 files changed, 1 insertions, 7 deletions

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 4a1d172209a..6d6ea831271 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -125,7 +125,6 @@ CONFIG_SERIAL_8250_PCI=y
 CONFIG_SND_EMU10K1_SEQ=m
 CONFIG_SND_OPL3_LIB_SEQ=m
 # CONFIG_SND_OPL4_LIB_SEQ is not set
-# CONFIG_SND_PCM_OSS is not set
 # CONFIG_SND_SBAWE_SEQ is not set
 CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPI_DESIGNWARE=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index f5e667007de..323ddb03c37 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -103,7 +103,6 @@ CONFIG_SERIAL_8250=y
 # CONFIG_SND_EMU10K1_SEQ is not set
 # CONFIG_SND_OPL3_LIB_SEQ is not set
 # CONFIG_SND_OPL4_LIB_SEQ is not set
-CONFIG_SND_PCM_OSS=m
 # CONFIG_SND_SBAWE_SEQ is not set
 CONFIG_SPI_DESIGNWARE=m
 # CONFIG_SPI_PXA2XX_PCI is not set
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index be264bce2a4..50d53a8d57e 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -103,7 +103,6 @@ CONFIG_SERIAL_8250=y
 # CONFIG_SND_EMU10K1_SEQ is not set
 # CONFIG_SND_OPL3_LIB_SEQ is not set
 # CONFIG_SND_OPL4_LIB_SEQ is not set
-CONFIG_SND_PCM_OSS=m
 # CONFIG_SND_SBAWE_SEQ is not set
 CONFIG_SPI_DESIGNWARE=m
 # CONFIG_SPI_PXA2XX_PCI is not set
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 978e503548f..8ab1e70b2d2 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -5188,7 +5188,7 @@ CONFIG_SND_OXYGEN_LIB=m
 CONFIG_SND_PCI=y
 CONFIG_SND_PCM=m
 CONFIG_SND_PCMCIA=y
-CONFIG_SND_PCM_OSS_PLUGINS=y
+# CONFIG_SND_PCM_OSS is not set
 CONFIG_SND_PCSP=m
 CONFIG_SND_PCXHR=m
 CONFIG_SND_PDAUDIOCF=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 3c9a0189aa7..32cf726e4d9 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -125,7 +125,6 @@ CONFIG_SERIAL_8250_PCI=y
 CONFIG_SND_EMU10K1_SEQ=m
 CONFIG_SND_OPL3_LIB_SEQ=m
 CONFIG_SND_OPL4_LIB_SEQ=m
-# CONFIG_SND_PCM_OSS is not set
 CONFIG_SND_SBAWE_SEQ=m
 # CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_SPI_DESIGNWARE=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 1e4118f8abf..a4b565f75e7 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -115,7 +115,6 @@ CONFIG_SND_BT87X_OVERCLOCK=y
 CONFIG_SND_EMU10K1_SEQ=m
 CONFIG_SND_OPL3_LIB_SEQ=m
 # CONFIG_SND_OPL4_LIB_SEQ is not set
-# CONFIG_SND_PCM_OSS is not set
 # CONFIG_SND_SBAWE_SEQ is not set
 CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPI_DESIGNWARE=y
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 9aff6102d29..de7e3eb90f0 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -149,7 +149,6 @@ CONFIG_SND_BT87X_OVERCLOCK=y
 CONFIG_SND_EMU10K1_SEQ=m
 CONFIG_SND_OPL3_LIB_SEQ=m
 # CONFIG_SND_OPL4_LIB_SEQ is not set
-# CONFIG_SND_PCM_OSS is not set
 # CONFIG_SND_SBAWE_SEQ is not set
 CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPI_DESIGNWARE=y