--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -867,6 +867,16 @@ static int __devinit m25p_probe(struct s
+@@ -872,6 +872,16 @@ static int __devinit m25p_probe(struct s
part_probes, &parts, 0);
}
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -877,6 +877,15 @@ static int __devinit m25p_probe(struct s
+@@ -882,6 +882,15 @@ static int __devinit m25p_probe(struct s
}
#endif
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -886,6 +886,16 @@ static int __devinit m25p_probe(struct s
+@@ -891,6 +891,16 @@ static int __devinit m25p_probe(struct s
part_probes, &parts, 0);
}
#endif
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -922,6 +922,16 @@ static int __devinit m25p_probe(struct s
+@@ -927,6 +927,16 @@ static int __devinit m25p_probe(struct s
part_probes, &parts, 0);
}
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -932,6 +932,15 @@ static int __devinit m25p_probe(struct s
+@@ -937,6 +937,15 @@ static int __devinit m25p_probe(struct s
}
#endif
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -941,6 +941,16 @@ static int __devinit m25p_probe(struct s
+@@ -946,6 +946,16 @@ static int __devinit m25p_probe(struct s
part_probes, &parts, 0);
}
#endif
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -923,6 +923,16 @@ static int __devinit m25p_probe(struct s
+@@ -928,6 +928,16 @@ static int __devinit m25p_probe(struct s
part_probes, &parts, 0);
}
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -933,6 +933,15 @@ static int __devinit m25p_probe(struct s
+@@ -938,6 +938,15 @@ static int __devinit m25p_probe(struct s
}
#endif
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -942,6 +942,16 @@ static int __devinit m25p_probe(struct s
+@@ -947,6 +947,16 @@ static int __devinit m25p_probe(struct s
part_probes, &parts, 0);
}
#endif
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -923,6 +923,16 @@ static int __devinit m25p_probe(struct s
+@@ -928,6 +928,16 @@ static int __devinit m25p_probe(struct s
part_probes, &parts, 0);
}
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -933,6 +933,15 @@ static int __devinit m25p_probe(struct s
+@@ -938,6 +938,15 @@ static int __devinit m25p_probe(struct s
}
#endif
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -942,6 +942,16 @@ static int __devinit m25p_probe(struct s
+@@ -947,6 +947,16 @@ static int __devinit m25p_probe(struct s
part_probes, &parts, 0);
}
#endif