From patchwork Thu Oct 8 16:39:13 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brad Figg X-Patchwork-Id: 35485 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 9FF95B7B85 for ; Fri, 9 Oct 2009 03:39:44 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.60) (envelope-from ) id 1Mvw1i-0001VF-5X; Thu, 08 Oct 2009 17:39:38 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.60) (envelope-from ) id 1Mvw1Z-0001Mj-1w for kernel-team@lists.ubuntu.com; Thu, 08 Oct 2009 17:39:29 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1Mvw1Z-0003JN-0c for ; Thu, 08 Oct 2009 17:39:29 +0100 Received: from pool-173-50-147-79.ptldor.fios.verizon.net ([173.50.147.79] helo=localhost) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1Mvw1Y-0007Or-IG for kernel-team@lists.ubuntu.com; Thu, 08 Oct 2009 17:39:28 +0100 From: Brad Figg To: kernel-team@lists.ubuntu.com Subject: [PATCH 5/5] UBUNTU: CONFIG: IMX51: change SGTL5000 driver to be builtin instead of a module. Date: Thu, 8 Oct 2009 09:39:13 -0700 Message-Id: <1255019953-21442-6-git-send-email-brad.figg@canonical.com> X-Mailer: git-send-email 1.6.4.4 In-Reply-To: <1255019953-21442-1-git-send-email-brad.figg@canonical.com> References: <1255019953-21442-1-git-send-email-brad.figg@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.8 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Signed-off-by: Brad Figg --- debian.fsl-imx51/config/config.common.ubuntu | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/debian.fsl-imx51/config/config.common.ubuntu b/debian.fsl-imx51/config/config.common.ubuntu index c7c95b0..33983fe 100644 --- a/debian.fsl-imx51/config/config.common.ubuntu +++ b/debian.fsl-imx51/config/config.common.ubuntu @@ -2159,7 +2159,7 @@ CONFIG_SMSC_PHY=m CONFIG_SMS_SDIO_DRV=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_USB_DRV=m -CONFIG_SND=m +CONFIG_SND=y CONFIG_SND_ARM=y # CONFIG_SND_DEBUG is not set CONFIG_SND_DRIVERS=y @@ -2174,14 +2174,14 @@ CONFIG_SND_MPU401=m CONFIG_SND_MPU401_UART=m CONFIG_SND_MTPAV=m CONFIG_SND_MTS64=m -CONFIG_SND_MXC_SOC=m +CONFIG_SND_MXC_SOC=y CONFIG_SND_MXC_SOC_IRAM=y -CONFIG_SND_MXC_SOC_SSI=m +CONFIG_SND_MXC_SOC_SSI=y CONFIG_SND_MXC_SPDIF=m # CONFIG_SND_OPL3_LIB_SEQ is not set # CONFIG_SND_OPL4_LIB_SEQ is not set CONFIG_SND_OSSEMUL=y -CONFIG_SND_PCM=m +CONFIG_SND_PCM=y CONFIG_SND_PCMCIA=y CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y @@ -2195,14 +2195,14 @@ CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_SEQ_DUMMY=m CONFIG_SND_SEQ_HRTIMER_DEFAULT=y CONFIG_SND_SERIAL_U16550=m -CONFIG_SND_SOC=m +CONFIG_SND_SOC=y # CONFIG_SND_SOC_ALL_CODECS is not set -CONFIG_SND_SOC_I2C_AND_SPI=m -CONFIG_SND_SOC_IMX_3STACK_SGTL5000=m -CONFIG_SND_SOC_SGTL5000=m +CONFIG_SND_SOC_I2C_AND_SPI=y +CONFIG_SND_SOC_IMX_3STACK_SGTL5000=y +CONFIG_SND_SOC_SGTL5000=y CONFIG_SND_SPI=y CONFIG_SND_SUPPORT_OLD_API=y -CONFIG_SND_TIMER=m +CONFIG_SND_TIMER=y CONFIG_SND_USB=y CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_CAIAQ=m @@ -2222,7 +2222,7 @@ CONFIG_SOC_CAMERA_PLATFORM=m CONFIG_SOC_CAMERA_TW9910=m CONFIG_SOFT_WATCHDOG=m CONFIG_SOLARIS_X86_PARTITION=y -CONFIG_SOUND=m +CONFIG_SOUND=y CONFIG_SOUND_OSS_CORE=y # CONFIG_SOUND_PRIME is not set # CONFIG_SPARSEMEM_MANUAL is not set