Messages in this thread | | | Subject | RE: linux-next: manual merge of the mtd tree with the i2c tree | Date | Tue, 8 Sep 2009 12:52:07 -0400 | From | "H Hartley Sweeten" <> |
| |
On Sunday, September 06, 2009 8:36 PM, Stephen Rothwell wrote: > 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.
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
> -- > Cheers, > Stephen Rothwell sfr@canb.auug.org.au > > 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[] = { > &mtd_group, > NULL, > };
| |