projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
02f8a24
)
mtd: spi-nor: remove duplicated w25q128 entry
author
Rafał Miłecki
<zajec5@gmail.com>
Thu, 7 Aug 2014 07:47:01 +0000
(09:47 +0200)
committer
Brian Norris
<computersforpeace@gmail.com>
Tue, 19 Aug 2014 18:53:10 +0000
(11:53 -0700)
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Acked-by: Huang Shijie <shijie8@gmail.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
drivers/mtd/spi-nor/spi-nor.c
patch
|
blob
|
history
diff --git
a/drivers/mtd/spi-nor/spi-nor.c
b/drivers/mtd/spi-nor/spi-nor.c
index 4dc0c8662265a0c6c3d1d45635043752f0d60fe2..2fea172dd53035528570aab6dda8a185a8511ffe 100644
(file)
--- 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) },