lkml.org 
[lkml]   [2010]   [Jan]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: linux-next: manual merge of the arm tree with the arm-current tree
    On Mon, Jan 18, 2010 at 10:35:34AM +1100, Stephen Rothwell wrote:
    > Hi Russell,
    >
    > Today's linux-next merge of the arm tree got a conflict in
    > arch/arm/Makefile between commit 95b8f20fd6a2694a16b8addb190b942bfb670c88
    > (ARM: fix badly placed mach/plat entries in Kconfig & Makefile"") from
    > the arm-current tree and commit c4ffccddd54b669cc9683f2c69e31035e916a1a0
    > ("ARM: S5P6440: Add new Kconfig and Makefiles") from the arm tree.
    >
    > I fixed it up (see below) and can carry the fix for a while.

    Is that from the merge of next-samsung or from two parts of the ARM
    trees?

    > --
    > Cheers,
    > Stephen Rothwell sfr@canb.auug.org.au
    >
    > (Sorry, cut and paste diff)
    > diff --cc arch/arm/Makefile
    > index 9e75825,bbcd512..0000000
    > --- a/arch/arm/Makefile
    > +++ b/arch/arm/Makefile
    > @@@ -184,7 -184,9 +185,8 @@@ plat-$(CONFIG_PLAT_ORION) := orio
    > plat-$(CONFIG_PLAT_PXA) := pxa
    > plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx s3c samsung
    > plat-$(CONFIG_PLAT_S3C64XX) := s3c64xx s3c samsung
    > -plat-$(CONFIG_PLAT_S5PC1XX) := s5pc1xx s3c samsung
    > + plat-$(CONFIG_PLAT_S5P) := s5p samsung s3c
    > -plat-$(CONFIG_ARCH_STMP3XXX) := stmp3xxx
    > +plat-$(CONFIG_PLAT_S5PC1XX) := s5pc1xx s3c samsung
    >
    > ifeq ($(CONFIG_ARCH_EBSA110),y)
    > # This is what happens if you forget the IOCS16 line.
    > --
    > To unsubscribe from this list: send the line "unsubscribe linux-next" in
    > the body of a message to majordomo@vger.kernel.org
    > More majordomo info at http://vger.kernel.org/majordomo-info.html

    --
    --
    Ben

    Q: What's a light-year?
    A: One-third less calories than a regular year.



    \
     
     \ /
      Last update: 2010-01-18 02:35    [W:0.042 / U:177.624 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site