mtd: spi-nor: remove duplicated w25q128 entry

Linux-MTD Mailing List linux-mtd at lists.infradead.org
Wed Oct 15 23:59:04 PDT 2014


Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=ab75e89c013d8fff8bd8a6e520d184c3da1a4583
Commit:     ab75e89c013d8fff8bd8a6e520d184c3da1a4583
Parent:     02f8a24e7b1c253ee37edc684200c11300de23f9
Author:     Rafał Miłecki <zajec5 at gmail.com>
AuthorDate: Thu Aug 7 09:47:01 2014 +0200
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Tue Aug 19 11:53:10 2014 -0700

    mtd: spi-nor: remove duplicated w25q128 entry
    
    Signed-off-by: Rafał Miłecki <zajec5 at gmail.com>
    Acked-by: Huang Shijie <shijie8 at gmail.com>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 drivers/mtd/spi-nor/spi-nor.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index 4dc0c86..2fea172 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -624,7 +624,6 @@ const struct spi_device_id spi_nor_ids[] = {
 	{ "w25q32dw", INFO(0xef6016, 0, 64 * 1024,  64, SECT_4K) },
 	{ "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) },
 	{ "w25q64", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) },
-	{ "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) },
 	{ "w25q80", INFO(0xef5014, 0, 64 * 1024,  16, SECT_4K) },
 	{ "w25q80bl", INFO(0xef4014, 0, 64 * 1024,  16, SECT_4K) },
 	{ "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) },



More information about the linux-mtd-cvs mailing list