--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -195,6 +195,7 @@ static ssize_t m25p80_read(struct spi_no
+@@ -235,6 +235,7 @@ static ssize_t m25p80_read(struct spi_no
*/
static int m25p_probe(struct spi_device *spi)
{
struct flash_platform_data *data;
struct m25p *flash;
struct spi_nor *nor;
-@@ -247,8 +248,11 @@ static int m25p_probe(struct spi_device
+@@ -300,8 +301,11 @@ static int m25p_probe(struct spi_device
if (ret)
return ret;
--- a/include/linux/spi/flash.h
+++ b/include/linux/spi/flash.h
-@@ -24,6 +24,7 @@ struct flash_platform_data {
+@@ -25,6 +25,7 @@ struct flash_platform_data {
unsigned int nr_parts;
char *type;