From patchwork Tue Nov 2 14:50:32 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 297552 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oA2Epikm020541 for ; Tue, 2 Nov 2010 14:51:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752872Ab0KBOvn (ORCPT ); Tue, 2 Nov 2010 10:51:43 -0400 Received: from d1.icnet.pl ([212.160.220.21]:47532 "EHLO d1.icnet.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752534Ab0KBOvm (ORCPT ); Tue, 2 Nov 2010 10:51:42 -0400 Received: from 87-205-12-81.ip.netia.com.pl ([87.205.12.81] helo=vclass.intranet) by d1.icnet.pl with asmtp (TLS-1.0:DHE_RSA_AES_128_CBC_SHA:16) (Exim 4.34) id 1PDID4-00008D-GB; Tue, 02 Nov 2010 15:51:38 +0100 From: Janusz Krzysztofik Organization: Tele-Info-System, Poznan, PL To: Jarkko Nikula , Peter Ujfalusi Subject: [PATCH 2.6.37-rc1] ASoC: OMAP: fix OMAP1 compilation problem Date: Tue, 2 Nov 2010 15:50:32 +0100 User-Agent: KMail/1.9.10 Cc: Mark Brown , Liam Girdwood , Paul Walmsley , alsa-devel@alsa-project.org, "linux-omap@vger.kernel.org" , e3-hacking@earth.li MIME-Version: 1.0 Content-Disposition: inline Message-Id: <201011021550.34885.jkrzyszt@tis.icnet.pl> X-SA-Exim-Scanned: No (on d1.icnet); SAEximRunCond expanded to false Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 02 Nov 2010 14:51:45 +0000 (UTC) --- linux-2.6.37-rc1/sound/soc/omap/omap-mcbsp.c.orig 2010-11-01 22:43:16.000000000 +0100 +++ linux-2.6.37-rc1/sound/soc/omap/omap-mcbsp.c 2010-11-02 15:41:42.000000000 +0100 @@ -644,15 +644,23 @@ static int omap_mcbsp_dai_set_dai_sysclk case OMAP_MCBSP_CLKR_SRC_CLKR: + if (cpu_class_is_omap1()) + break; omap2_mcbsp1_mux_clkr_src(CLKR_SRC_CLKR); break; case OMAP_MCBSP_CLKR_SRC_CLKX: + if (cpu_class_is_omap1()) + break; omap2_mcbsp1_mux_clkr_src(CLKR_SRC_CLKX); break; case OMAP_MCBSP_FSR_SRC_FSR: + if (cpu_class_is_omap1()) + break; omap2_mcbsp1_mux_fsr_src(FSR_SRC_FSR); break; case OMAP_MCBSP_FSR_SRC_FSX: + if (cpu_class_is_omap1()) + break; omap2_mcbsp1_mux_fsr_src(FSR_SRC_FSX); break; default: