author | David Woodhouse <David.Woodhouse@intel.com> | |
Sun, 20 Sep 2009 12:55:36 +0000 (05:55 -0700) | ||
committer | David Woodhouse <David.Woodhouse@intel.com> | |
Sun, 20 Sep 2009 12:55:36 +0000 (05:55 -0700) |
Conflicts:
drivers/mtd/mtdcore.c
Merged in order that I can apply the Nomadik nand/onenand support patches.
drivers/mtd/mtdcore.c
Merged in order that I can apply the Nomadik nand/onenand support patches.
1 | 2 | |||
---|---|---|---|---|
arch/arm/mach-omap2/board-apollon.c | patch | | diff1 | | diff2 | | blob | history |
drivers/mtd/mtdblock.c | patch | | diff1 | | diff2 | | blob | history |
drivers/mtd/mtdcore.c | patch | | diff1 | | diff2 | | blob | history |
drivers/mtd/mtdpart.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc arch/arm/mach-omap2/board-apollon.c
Simple merge
diff --cc drivers/mtd/mtdblock.c
Simple merge
diff --cc drivers/mtd/mtdcore.c
index 3f559c0f1879a49590466b1f45de12769f4da4d5,69007a6eff50c3014c10677af1aea8f84a9fde81..467a4f177bfb269d684029954fb1731a011a12ce
+++ b/drivers/mtd/mtdcore.c
.attrs = mtd_attrs,
};
- static struct attribute_group *mtd_groups[] = {
-const struct attribute_group *mtd_groups[] = {
++static const struct attribute_group *mtd_groups[] = {
&mtd_group,
NULL,
};
diff --cc drivers/mtd/mtdpart.c
Simple merge