lkml.org 
[lkml]   [2012]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the arm-soc tree with the sound tree
    Hi all,

    Today's linux-next merge of the arm-soc tree got a conflict in
    arch/arm/mach-davinci/include/mach/da8xx.h between commit 896f66b7de29
    (ASoC/ARM: Davinci: McASP: split asp header into platform and audio
    specific"") from the sound tree and commit ec2a0833e515 ("ARM: davinci:
    move platform_data definitions") from the arm-soc tree.

    I fixed it up (see below) and can carry the fix as necessary (no action
    is required).

    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au

    diff --cc arch/arm/mach-davinci/include/mach/da8xx.h
    index c74a6ab,33e78ae..0000000
    --- a/arch/arm/mach-davinci/include/mach/da8xx.h
    +++ b/arch/arm/mach-davinci/include/mach/da8xx.h
    @@@ -20,11 -19,12 +20,11 @@@

    #include <mach/serial.h>
    #include <mach/edma.h>
    - #include <mach/i2c.h>
    - #include <mach/mmc.h>
    - #include <mach/usb.h>
    -#include <mach/asp.h>
    #include <mach/pm.h>
    - #include <mach/spi.h>
    + #include <linux/platform_data/i2c-davinci.h>
    + #include <linux/platform_data/mmc-davinci.h>
    + #include <linux/platform_data/usb-davinci.h>
    + #include <linux/platform_data/spi-davinci.h>

    extern void __iomem *da8xx_syscfg0_base;
    extern void __iomem *da8xx_syscfg1_base;
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2012-09-24 11:41    [W:3.499 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site