[lkml]   [2009]   [Sep]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Subjectlinux-next: manual merge of the mtd tree with the i2c tree
    Hi David,

    Today's linux-next merge of the mtd tree got a conflict in
    drivers/mtd/mtdcore.c between commit
    c6ce12828f9146f12d0654241bcb39523c257c90 ("driver model: constify
    attribute groups") from the i2c tree and commit
    fca910883324d437a24d447b08f524fa19261a94 ("mtd: make few symbols static")
    from the mtd tree.

    Just overlapping changes. I fixed it up (see below) and can carry the
    fix as necessary.
    Stephen Rothwell

    diff --cc drivers/mtd/mtdcore.c
    index 69007a6,3f559c0..0000000
    --- a/drivers/mtd/mtdcore.c
    +++ b/drivers/mtd/mtdcore.c
    @@@ -217,7 -217,7 +217,7 @@@ static struct attribute_group mtd_grou
    .attrs = mtd_attrs,

    - const struct attribute_group *mtd_groups[] = {
    -static struct attribute_group *mtd_groups[] = {
    ++static const struct attribute_group *mtd_groups[] = {

     \ /
      Last update: 2009-09-07 05:39    [W:0.018 / U:0.032 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site