lkml.org 
[lkml]   [2011]   [Dec]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the 4xx tree with the powerpc tree
    Hi Josh,

    Today's linux-next merge of the 4xx tree got a conflict in
    arch/powerpc/platforms/40x/ppc40x_simple.c between commit 11eab297f57b
    ("powerpc: Add support for OpenBlockS 600") from the powerpc tree and
    commit d5b9ee7b514e ("powerpc/40x: Add APM8018X SOC support") from the
    4xx tree.

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

    [Josh: I have changed you contact address to the above]
    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au

    diff --cc arch/powerpc/platforms/40x/ppc40x_simple.c
    index ecac237,2f8fde6..0000000
    --- a/arch/powerpc/platforms/40x/ppc40x_simple.c
    +++ b/arch/powerpc/platforms/40x/ppc40x_simple.c
    @@@ -55,8 -55,8 +55,9 @@@ static const char *board[] __initdata
    "amcc,haleakala",
    "amcc,kilauea",
    "amcc,makalu",
    + "apm,klondike",
    - "est,hotfoot"
    + "est,hotfoot",
    + "plathome,obs600"
    };

    static int __init ppc40x_probe(void)
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2011-12-09 02:41    [W:0.024 / U:148.624 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site