From patchwork Wed Mar 6 09:41:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 225457 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 090722C0345 for ; Wed, 6 Mar 2013 20:41:53 +1100 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UDAr0-00086X-CR; Wed, 06 Mar 2013 09:41:42 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UDAqz-00086Q-7h for kernel-team@lists.ubuntu.com; Wed, 06 Mar 2013 09:41:41 +0000 Received: from 79-78-211-70.dynamic.dsl.as9105.com ([79.78.211.70] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1UDAqy-00007t-W7; Wed, 06 Mar 2013 09:41:41 +0000 From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1] UBUNTU: [Config] re-disable CONFIG_SOUND_OSS_PRECLAIM Date: Wed, 6 Mar 2013 09:41:39 +0000 Message-Id: <1362562899-13558-1-git-send-email-apw@canonical.com> X-Mailer: git-send-email 1.8.1.2 Cc: Andy Whitcroft X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com 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 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 --- 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 d145e8e..53e231a 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -5028,7 +5028,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