From: eric.y.miao@gmail.com (Eric Miao)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/5] colibri-pxa300: fix ac97 init on pxa310
Date: Tue, 13 Jul 2010 10:30:08 +0800 [thread overview]
Message-ID: <AANLkTinvPGmfpJx58jqAhe7U8gAjAkv2oBat4qfsgTYP@mail.gmail.com> (raw)
In-Reply-To: <20100709070227.GR17833@buzzloop.caiaq.de>
On Fri, Jul 9, 2010 at 3:02 PM, Daniel Mack <daniel@caiaq.de> wrote:
> On Thu, Jul 08, 2010 at 07:04:05PM +0200, pieterg wrote:
>> The wrong CONFIG defines were checked, and the <mach/audio.h>
>> include was missing
>>
>> Signed-off-by: pieter <p.grimmerink@inepro.com>
>
> Acked-by: Daniel Mack <daniel@caiaq.de>
>
Thanks. I'll pick this first into 'fix' branch.
>
>> ---
>> ?arch/arm/mach-pxa/colibri-pxa300.c | ? ?4 +++-
>> ?1 files changed, 3 insertions(+), 1 deletions(-)
>>
>> diff --git a/arch/arm/mach-pxa/colibri-pxa300.c
>> b/arch/arm/mach-pxa/colibri-pxa300.c
>> index 45c23fd..e7762ae 100644
>> --- a/arch/arm/mach-pxa/colibri-pxa300.c
>> +++ b/arch/arm/mach-pxa/colibri-pxa300.c
>> @@ -26,6 +26,7 @@
>> ?#include <mach/colibri.h>
>> ?#include <mach/ohci.h>
>> ?#include <mach/pxafb.h>
>> +#include <mach/audio.h>
>>
>> ?#include "generic.h"
>> ?#include "devices.h"
>> @@ -145,7 +146,8 @@ static void __init colibri_pxa300_init_lcd(void)
>> ?static inline void colibri_pxa300_init_lcd(void) {}
>> ?#endif /* CONFIG_FB_PXA || CONFIG_FB_PXA_MODULE */
>>
>> -#if defined(SND_AC97_CODEC) || defined(SND_AC97_CODEC_MODULE)
>> +#if ?defined(CONFIG_SND_AC97_CODEC) || \
>> + ? ? defined(CONFIG_SND_AC97_CODEC_MODULE)
>> ?static mfp_cfg_t colibri_pxa310_ac97_pin_config[] __initdata = {
>> ? ? ? GPIO24_AC97_SYSCLK,
>> ? ? ? GPIO23_AC97_nACRESET,
>> --
>> 1.6.5.rc1.44.ga1675
>>
>> _______________________________________________
>> linux-arm-kernel mailing list
>> linux-arm-kernel at lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
prev parent reply other threads:[~2010-07-13 2:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-08 17:04 [PATCH 2/5] colibri-pxa300: fix ac97 init on pxa310 pieterg
2010-07-08 20:00 ` Marek Vasut
2010-07-09 7:02 ` Daniel Mack
2010-07-13 2:30 ` Eric Miao [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AANLkTinvPGmfpJx58jqAhe7U8gAjAkv2oBat4qfsgTYP@mail.gmail.com \
--to=eric.y.miao@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).