Merge git://git.denx.de/u-boot-spi
diff --git a/drivers/mtd/spi/spi_flash_ids.c b/drivers/mtd/spi/spi_flash_ids.c
index 13f64e7..262d81e 100644
--- a/drivers/mtd/spi/spi_flash_ids.c
+++ b/drivers/mtd/spi/spi_flash_ids.c
@@ -67,6 +67,7 @@
{"gd25lq32", INFO(0xc86016, 0x0, 64 * 1024, 64, SECT_4K) },
#endif
#ifdef CONFIG_SPI_FLASH_ISSI /* ISSI */
+ {"is25lq040b", INFO(0x9d4013, 0x0, 64 * 1024, 8, 0) },
{"is25lp032", INFO(0x9d6016, 0x0, 64 * 1024, 64, 0) },
{"is25lp064", INFO(0x9d6017, 0x0, 64 * 1024, 128, 0) },
{"is25lp128", INFO(0x9d6018, 0x0, 64 * 1024, 256, 0) },
diff --git a/include/spi.h b/include/spi.h
index 8c4b882..08c7480 100644
--- a/include/spi.h
+++ b/include/spi.h
@@ -104,7 +104,6 @@
unsigned int wordlen;
unsigned int max_write_size;
void *memory_map;
- u8 option;
u8 flags;
#define SPI_XFER_BEGIN BIT(0) /* Assert CS before transfer */