Messages in this thread | | | Date | Mon, 7 Sep 2009 13:36:21 +1000 | From | Stephen Rothwell <> | Subject | linux-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. -- 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, };
| |