Merge branches 'acpi-battery', 'acpi-video' and 'acpi-misc'

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

diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h
index 5e25a7b75ae2fad388f613ec59b48f2cf5568291..1ede4c89805a1d88cfaab2a8624e9808be34de1f 100644 (file)
--- a/include/linux/mtd/spi-nor.h
+++ b/include/linux/mtd/spi-nor.h
@@ -47,8 +47,6 @@
 #define SPINOR_OP_RDID         0x9f    /* Read JEDEC ID */
 #define SPINOR_OP_RDSFDP       0x5a    /* Read SFDP */
 #define SPINOR_OP_RDCR         0x35    /* Read configuration register */
-#define SPINOR_OP_RDEAR                0xc8    /* Read Extended Address Register */
-#define SPINOR_OP_WREAR                0xc5    /* Write Extended Address Register */
 #define SPINOR_OP_SRSTEN       0x66    /* Software Reset Enable */
 #define SPINOR_OP_SRST         0x99    /* Software Reset */
 #define SPINOR_OP_GBULK                0x98    /* Global Block Unlock */
@@ -365,6 +363,7 @@ struct spi_nor_flash_parameter;
  * @write_proto:       the SPI protocol for write operations
  * @reg_proto:         the SPI protocol for read_reg/write_reg/erase operations
  * @sfdp:              the SFDP data of the flash
+ * @debugfs_root:      pointer to the debugfs directory
  * @controller_ops:    SPI NOR controller driver specific operations.
  * @params:            [FLASH-SPECIFIC] SPI NOR flash parameters and settings.
  *                      The structure includes legacy flash parameters and
@@ -394,6 +393,7 @@ struct spi_nor {
        u32                     flags;
        enum spi_nor_cmd_ext    cmd_ext_type;
        struct sfdp             *sfdp;
+       struct dentry           *debugfs_root;
 
        const struct spi_nor_controller_ops *controller_ops;