--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -498,6 +498,10 @@ static struct flash_info __devinitdata m
+@@ -500,6 +500,10 @@ static struct flash_info __devinitdata m
{ "at26df161a", 0x1f4601, 0, 64 * 1024, 32, SECT_4K, },
{ "at26df321", 0x1f4701, 0, 64 * 1024, 64, SECT_4K, },
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -716,6 +716,16 @@ static int __devinit m25p_probe(struct s
+@@ -718,6 +718,16 @@ static int __devinit m25p_probe(struct s
part_probes, &parts, 0);
}
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -498,6 +498,9 @@ static struct flash_info __devinitdata m
+@@ -500,6 +500,9 @@ static struct flash_info __devinitdata m
{ "at26df161a", 0x1f4601, 0, 64 * 1024, 32, SECT_4K, },
{ "at26df321", 0x1f4701, 0, 64 * 1024, 64, SECT_4K, },
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -729,6 +729,15 @@ static int __devinit m25p_probe(struct s
+@@ -731,6 +731,15 @@ static int __devinit m25p_probe(struct s
}
#endif
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -501,6 +501,11 @@ static struct flash_info __devinitdata m
+@@ -503,6 +503,11 @@ static struct flash_info __devinitdata m
/* EON -- en25px */
{ "en25p32", 0x1c2016, 0, 64 * 1024, 64, },
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -506,6 +506,11 @@ static struct flash_info __devinitdata m
+@@ -508,6 +508,11 @@ static struct flash_info __devinitdata m
{ "mx25l64", 0xc22017, 0, 64 * 1024, 128, },
{ "mx25l128", 0xc22018, 0, 64 * 1024, 256, },