On Thu, Jan 20, 2011 at 7:42 PM, Thomas Weber <weber@xxxxxxxxxxxxx> wrote:
> Fix building omap-mcbsp after replacing ARCH_OMAP24x0 in
> commit 8a9c1aa6a4caa7db1c2fca4b47168af9077e0f95.
>
>> omap: Start using CONFIG_SOC_OMAP
>>
>> We want to have just CONFIG_ARCH_OMAP2, 3 and 4. The rest
>> are nowadays just subcategories of these.
>>
>> Search and replace the following:
>>
>> ARCH_OMAP2420 SOC_OMAP2420
>> ARCH_OMAP2430 SOC_OMAP2430
>> ARCH_OMAP3430 SOC_OMAP3430
>
I was just about to post a patch for this, but you beat me
to it!
> Signed-off-by: Thomas Weber <weber@xxxxxxxxxxxxx>
Acked-by: Sourav Poddar <sourav.poddar@xxxxxx>
> ---
> sound/soc/omap/omap-mcbsp.c | 1 +
> sound/soc/omap/omap-mcbsp.h | 1 +
> 2 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
> index 3cc293b..ede6afd 100644
> --- a/sound/soc/omap/omap-mcbsp.c
> +++ b/sound/soc/omap/omap-mcbsp.c
> @@ -113,6 +113,7 @@ static const int omap44xx_dma_reqs[][2] = {
> static const int omap44xx_dma_reqs[][2] = {};
> #endif
>
> +#if defined(CONFIG_SOC_OMAP2420)
> static const unsigned long omap2420_mcbsp_port[][2] = {
> { OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR1,
> OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR1 },
> diff --git a/sound/soc/omap/omap-mcbsp.h b/sound/soc/omap/omap-mcbsp.h
> index b7b0ce1..37dc721 100644
> --- a/sound/soc/omap/omap-mcbsp.h
> +++ b/sound/soc/omap/omap-mcbsp.h
> @@ -54,6 +54,7 @@ enum omap_mcbsp_div {
> #undef NUM_LINKS
> #define NUM_LINKS 4
> #endif
> +#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_OMAP2430)
> #undef NUM_LINKS
> #define NUM_LINKS 5
> #endif
> --
> 1.7.4.rc2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
