From 62e36623b10ad5d595764da0499535b35dc90e69 Mon Sep 17 00:00:00 2001
From: Jan Luebbe <jlu@pengutronix.de>
Date: Fri, 24 Aug 2012 18:23:50 +0200
Subject: [PATCH] --- yaml --- r: 332724 b: refs/heads/master c:
 3105875f6b8902628caee2fd7821af43707c6bde h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/mtd/devices/m25p80.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index db79a50c0669..2434b40e102b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62beee20b1a53ba633badc4b57c68d815c9f3e66
+refs/heads/master: 3105875f6b8902628caee2fd7821af43707c6bde
diff --git a/trunk/drivers/mtd/devices/m25p80.c b/trunk/drivers/mtd/devices/m25p80.c
index 980cd6dac5d7..33ab2b736ed0 100644
--- a/trunk/drivers/mtd/devices/m25p80.c
+++ b/trunk/drivers/mtd/devices/m25p80.c
@@ -663,6 +663,7 @@ static const struct spi_device_id m25p_ids[] = {
 	{ "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
 
 	/* Micron */
+	{ "n25q128",  INFO(0x20ba18, 0, 64 * 1024, 256, 0) },
 	{ "n25q256a", INFO(0x20ba19, 0, 64 * 1024, 512, SECT_4K) },
 
 	/* Spansion -- single (large) sector size only, at least