[PATCH Utopic SRU] UBUNTU: [Config] CONFIG_SOUND_OSS_CORE_PRECLAIM=n

[tim.gardner at canonical.com]

From: Tim Gardner <tim.gardner at canonical.com>

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

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 debian.master/config/config.common.ubuntu | 2 +-
 debian.master/config/enforce              | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 41b9773..2a21eb0 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -6715,7 +6715,7 @@ CONFIG_SONYPI_COMPAT=y
 CONFIG_SONY_FF=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_SPAPR_TCE_IOMMU=y
diff --git a/debian.master/config/enforce b/debian.master/config/enforce
index c6857a8..781121e 100644
--- a/debian.master/config/enforce
+++ b/debian.master/config/enforce
@@ -28,6 +28,9 @@ value CONFIG_DEBUG_INFO y
 (arch armel armhf &/ value CONFIG_DEFAULT_MMAP_MIN_ADDR 32768) | \
  value CONFIG_DEFAULT_MMAP_MIN_ADDR 65536
 
+#LP#1105230 and LP#1385510
+!exists CONFIG_SOUND_OSS_CORE_PRECLAIM | value CONFIG_SOUND_OSS_CORE_PRECLAIM n
+
 #LP#1374440
 !exists CONFIG_HOTPLUG_PCI_PCIE | (arch ppc64el &/ value CONFIG_HOTPLUG_PCI_PCIE n) | value CONFIG_HOTPLUG_PCI_PCIE y
 
-- 
1.9.1