[Quantal SRU] [PATCH 1/1] UBUNTU: [Config] re-disable CONFIG_SOUND_OSS_PRECLAIM

[Andy Whitcroft]

We intended to turn off CONFIG_SOUND_OSS in maverick timeframe:

    https://lists.ubuntu.com/archives/kernel-team/2010-May/010647.html

We inadvertantly reenabled it for some early ARM work in the commit below:

  commit d5a54f43f357d4814f2c3d53ca3d5c3f6fddebe0
  Author: Andy Whitcroft <apw at canonical.com>
  Date:   Thu Jan 12 14:32:10 2012 +0000

    UBUNTU: [Config] pull ARM sound modules =m

These being enabled prevent the very userspace shims we intended to use for
OSS consumers, given that none of them are enabled in the current kernel.

Turn off CONFIG_SOUND_OSS_PRECLAIM as that is actually the bit which breaks
other users.  If you do use the in theory redundant driver it will still
function with this change.

BugLink: http://bugs.launchpad.net/bugs/1105230
Signed-off-by: Andy Whitcroft <apw at canonical.com>
---
 debian.master/config/config.common.ubuntu | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index bcc55f5..bd60f22 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -5378,7 +5378,7 @@ CONFIG_SONYPI=m
 CONFIG_SONYPI_COMPAT=y
 CONFIG_SONY_LAPTOP=m
 CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
 # CONFIG_SOUND_PRIME is not set
 CONFIG_SP5100_TCO=m
 CONFIG_SPARSEMEM=y
-- 
1.8.1.2