--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -32,6 +32,7 @@ struct m25p {
+@@ -31,6 +31,7 @@
+ struct m25p {
struct spi_device *spi;
struct spi_nor spi_nor;
- struct mtd_info mtd;
+ int max_transfer_len;
u8 command[MAX_CMD_SIZE];
};
-@@ -121,7 +122,7 @@ static inline unsigned int m25p80_rx_nbi
+@@ -119,7 +120,7 @@ static inline unsigned int m25p80_rx_nbi
* Read an address range from the nor chip. The address range
* may be any size provided it is within the physical boundaries.
*/
size_t *retlen, u_char *buf)
{
struct m25p *flash = nor->priv;
-@@ -154,6 +155,29 @@ static int m25p80_read(struct spi_nor *n
+@@ -152,6 +153,29 @@ static int m25p80_read(struct spi_nor *n
return 0;
}
static int m25p80_erase(struct spi_nor *nor, loff_t offset)
{
struct m25p *flash = nor->priv;
-@@ -228,6 +252,9 @@ static int m25p_probe(struct spi_device
+@@ -223,6 +247,9 @@ static int m25p_probe(struct spi_device
else
flash_name = spi->modalias;