[PATCH 1/1] [Maverick] Disable CONFIG_SOUND_OSS* and CONFIG_SND_*OSS*

[Leann Ogasawara]

During the UDS Maverick kernel config review session [1], it was
requested that we disable CONFIG_SOUND_OSS* and CONFIG_SND_*OSS* .  The
reason being is that in Maverick we're investigating using OSSp to shunt
all apps attempting to use the older in-kernel OSS API to use pulse
instead.  To do so, we need to disable all forms of OSS (native and
emulated). This means disabling CONFIG_SOUND_OSS* and CONFIG_SND_*OSS* .
This following patch disables these config options.

Thanks,
Leann

[1] https://wiki.ubuntu.com/KernelTeam/Specs/KernelMaverickConfigReview

>From 859c28b07ff0dedfff33b4bf896f27956fb06b00 Mon Sep 17 00:00:00 2001
From: Leann Ogasawara <leann.ogasawara at canonical.com>
Date: Sun, 23 May 2010 13:35:22 -0700
Subject: [PATCH] UBUNTU: [Config] Disable CONFIG_SOUND_OSS* and CONFIG_SND_*OSS

BugLink: http://bugs.launchpad.net/bugs/579300

In Maverick we're investigating using OSSp to shunt all apps attempting
to use the older in-kernel OSS API to use pulse instead.  To do so,
we need to disable all forms of OSS (native and emulated). This means
disabling CONFIG_SOUND_OSS* and CONFIG_SND_*OSS*.

Signed-off-by: Leann Ogasawara <leann.ogasawara at canonical.com>
---
 debian.master/config/config.common.ports  |   32 +++--------------------
 debian.master/config/config.common.ubuntu |   39 +++-------------------------
 2 files changed, 10 insertions(+), 61 deletions(-)

diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports
index 35c61e7..bd3e95d 100644
--- a/debian.master/config/config.common.ports
+++ b/debian.master/config/config.common.ports
@@ -2653,7 +2653,6 @@ CONFIG_PS3_STORAGE=m
 CONFIG_PS3_SYS_MANAGER=y
 CONFIG_PS3_VUART=y
 CONFIG_PSERIES_MSI=y
-CONFIG_PSS_MIXER=y
 CONFIG_QFMT_V2=m
 CONFIG_QLA3XXX=m
 CONFIG_QLCNIC=m
@@ -2862,10 +2861,6 @@ CONFIG_SATA_VIA=m
 CONFIG_SATA_VITESSE=m
 CONFIG_SBUS=y
 CONFIG_SBUSCHAR=y
-CONFIG_SC6600=y
-CONFIG_SC6600_CDROM=4
-CONFIG_SC6600_CDROMBASE=0
-CONFIG_SC6600_JOY=y
 CONFIG_SC92031=m
 # CONFIG_SCANLOG is not set
 CONFIG_SCHED_DEBUG=y
@@ -3227,7 +3222,7 @@ CONFIG_SND_LX6464ES=m
 CONFIG_SND_MAESTRO3=m
 CONFIG_SND_MIA=m
 CONFIG_SND_MIXART=m
-CONFIG_SND_MIXER_OSS=m
+# CONFIG_SND_MIXER_OSS is not set
 CONFIG_SND_MONA=m
 CONFIG_SND_MPU401=m
 CONFIG_SND_MPU401_UART=m
@@ -3237,13 +3232,11 @@ CONFIG_SND_NM256=m
 CONFIG_SND_OPL3_LIB=m
 CONFIG_SND_OPL3_LIB_SEQ=m
 # CONFIG_SND_OPL4_LIB_SEQ is not set
-CONFIG_SND_OSSEMUL=y
 # CONFIG_SND_OXYGEN is not set
 CONFIG_SND_PCI=y
 CONFIG_SND_PCM=m
 CONFIG_SND_PCMCIA=y
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
+# CONFIG_SND_PCM_OSS is not set
 CONFIG_SND_PCXHR=m
 CONFIG_SND_PDAUDIOCF=m
 CONFIG_SND_PORTMAN2X4=m
@@ -3262,7 +3255,7 @@ CONFIG_SND_SB16_DSP=m
 # CONFIG_SND_SBAWE_SEQ is not set
 CONFIG_SND_SB_COMMON=m
 CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQUENCER_OSS=y
+# CONFIG_SND_SEQUENCER_OSS is not set
 CONFIG_SND_SEQ_DUMMY=m
 CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
 CONFIG_SND_SERIAL_U16550=m
@@ -3360,23 +3353,8 @@ CONFIG_SOC_CAMERA_RJ54N1=m
 CONFIG_SOC_CAMERA_TW9910=m
 CONFIG_SOFT_WATCHDOG=m
 CONFIG_SOUND=m
-CONFIG_SOUND_AEDSP16=m
-CONFIG_SOUND_DMAP=y
-CONFIG_SOUND_KAHLUA=m
-CONFIG_SOUND_MPU401=m
-CONFIG_SOUND_MSS=m
-CONFIG_SOUND_OSS=m
-CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUND_PAS=m
-CONFIG_SOUND_PRIME=m
-CONFIG_SOUND_PSS=m
-CONFIG_SOUND_SB=m
-# CONFIG_SOUND_TRACEINIT is not set
-CONFIG_SOUND_TRIX=m
-CONFIG_SOUND_UART6850=m
-CONFIG_SOUND_VMIDI=m
-CONFIG_SOUND_YM3812=m
+# CONFIG_SOUND_OSS_CORE is not set
+# CONFIG_SOUND_PRIME is not set
 CONFIG_SPARC=y
 # CONFIG_SPARC32 is not set
 CONFIG_SPARC64=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 3c4b7ac..bc34653 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2408,10 +2408,6 @@ CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
 CONFIG_MSI_LAPTOP=m
 CONFIG_MSI_WMI=m
-CONFIG_MSNDCLAS_INIT_FILE="/etc/sound/msndinit.bin"
-CONFIG_MSNDCLAS_PERM_FILE="/etc/sound/msndperm.bin"
-CONFIG_MSNDPIN_INIT_FILE="/etc/sound/pndspini.bin"
-CONFIG_MSNDPIN_PERM_FILE="/etc/sound/pndsperm.bin"
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MTDRAM_ERASE_SIZE=128
 CONFIG_MTDRAM_TOTAL_SIZE=4096
@@ -3068,8 +3064,6 @@ CONFIG_PROFILING=y
 CONFIG_PROTEON=m
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_PSS_HAVE_BOOT is not set
-CONFIG_PSS_MIXER=y
 CONFIG_QFMT_V1=m
 CONFIG_QFMT_V2=m
 CONFIG_QLA3XXX=m
@@ -3300,10 +3294,6 @@ CONFIG_SBNI=m
 # CONFIG_SBNI_MULTILINE is not set
 CONFIG_SC1200_WDT=m
 CONFIG_SC520_WDT=m
-CONFIG_SC6600=y
-CONFIG_SC6600_CDROM=4
-CONFIG_SC6600_CDROMBASE=0
-CONFIG_SC6600_JOY=y
 CONFIG_SC92031=m
 CONFIG_SCA3000=m
 CONFIG_SCC=m
@@ -3744,7 +3734,7 @@ CONFIG_SND_MAESTRO3=m
 CONFIG_SND_MIA=m
 CONFIG_SND_MIRO=m
 CONFIG_SND_MIXART=m
-CONFIG_SND_MIXER_OSS=m
+# CONFIG_SND_MIXER_OSS is not set
 CONFIG_SND_MONA=m
 CONFIG_SND_MPU401_UART=m
 CONFIG_SND_MSND_CLASSIC=m
@@ -3757,14 +3747,12 @@ CONFIG_SND_OPL4_LIB=m
 CONFIG_SND_OPTI92X_AD1848=m
 CONFIG_SND_OPTI92X_CS4231=m
 CONFIG_SND_OPTI93X=m
-CONFIG_SND_OSSEMUL=y
 CONFIG_SND_OXYGEN=m
 CONFIG_SND_OXYGEN_LIB=m
 CONFIG_SND_PCI=y
 CONFIG_SND_PCM=m
 CONFIG_SND_PCMCIA=y
-CONFIG_SND_PCM_OSS=m
-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
@@ -3782,7 +3770,7 @@ CONFIG_SND_SB8_DSP=m
 CONFIG_SND_SBAWE=m
 CONFIG_SND_SB_COMMON=m
 CONFIG_SND_SC6000=m
-CONFIG_SND_SEQUENCER_OSS=y
+# CONFIG_SND_SEQUENCER_OSS is not set
 CONFIG_SND_SEQ_DUMMY=m
 CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
 CONFIG_SND_SGALAXY=m
@@ -3885,25 +3873,8 @@ CONFIG_SONYPI=m
 CONFIG_SONYPI_COMPAT=y
 CONFIG_SONY_LAPTOP=m
 CONFIG_SOUND=m
-CONFIG_SOUND_AEDSP16=m
-CONFIG_SOUND_DMAP=y
-CONFIG_SOUND_KAHLUA=m
-CONFIG_SOUND_MPU401=m
-CONFIG_SOUND_MSNDCLAS=m
-CONFIG_SOUND_MSNDPIN=m
-CONFIG_SOUND_MSS=m
-CONFIG_SOUND_OSS=m
-CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUND_PAS=m
-CONFIG_SOUND_PRIME=m
-CONFIG_SOUND_PSS=m
-CONFIG_SOUND_SB=m
-# CONFIG_SOUND_TRACEINIT is not set
-CONFIG_SOUND_TRIX=m
-CONFIG_SOUND_UART6850=m
-CONFIG_SOUND_VMIDI=m
-CONFIG_SOUND_YM3812=m
+# CONFIG_SOUND_OSS_CORE is not set
+# CONFIG_SOUND_PRIME is not set
 CONFIG_SPARSEMEM=y
 CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
 CONFIG_SPARSEMEM_EXTREME=y
-- 
1.7.0.4