Merge tag 'mtd/for-5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux

[linux-2.6-microblaze.git] / include / linux / mtd / spi-nor.h

diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h
index 1ede4c8..42218a1 100644 (file)
--- a/include/linux/mtd/spi-nor.h
+++ b/include/linux/mtd/spi-nor.h
@@ -351,7 +351,7 @@ struct spi_nor_flash_parameter;
  * @bouncebuf_size:    size of the bounce buffer
  * @info:              SPI NOR part JEDEC MFR ID and other info
  * @manufacturer:      SPI NOR manufacturer
- * @addr_width:                number of address bytes
+ * @addr_nbytes:       number of address bytes
  * @erase_opcode:      the opcode for erasing a sector
  * @read_opcode:       the read opcode
  * @read_dummy:                the dummy needed by the read operation
@@ -381,7 +381,7 @@ struct spi_nor {
        size_t                  bouncebuf_size;
        const struct flash_info *info;
        const struct spi_nor_manufacturer *manufacturer;
-       u8                      addr_width;
+       u8                      addr_nbytes;
        u8                      erase_opcode;
        u8                      read_opcode;
        u8                      read_dummy;