From 98c4c07717262b28ece7d21456f9f86fef15903e Mon Sep 17 00:00:00 2001
From: Knut Wohlrab <knut.wohlrab@de.bosch.com>
Date: Tue, 17 Jul 2012 15:45:53 +0200
Subject: [PATCH] --- yaml --- r: 332671 b: refs/heads/master c:
 4800399e335658aae632f587f6759a860f584804 h: refs/heads/master i:   332669:
 eeebf867b1e8022d8ba79a06f9a55a9e366f19ed   332667:
 35caa2689fafa66b92352bbb0d4805ea67886900   332663:
 6a3d400292b29fe54d5a0a9d8cd098bd21aa028e   332655:
 c3af622ad90a1883db367147321269ca05be4132   332639:
 cb6938f97270101583ee471c493ca4afc4033e8d   332607:
 9f25ab28057248c72962ab92af515d151027a559   332543:
 b713f647912c12be11d881f46b2ea47b149cd17a 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 463b756927a0..d3887fbe003b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0dd89c56edc9274c513dbd2ba6dc8229aeeaa44
+refs/heads/master: 4800399e335658aae632f587f6759a860f584804
diff --git a/trunk/drivers/mtd/devices/m25p80.c b/trunk/drivers/mtd/devices/m25p80.c
index b4dbcefec3e0..525734573822 100644
--- a/trunk/drivers/mtd/devices/m25p80.c
+++ b/trunk/drivers/mtd/devices/m25p80.c
@@ -702,6 +702,7 @@ static const struct spi_device_id m25p_ids[] = {
 	{ "m25p32",  INFO(0x202016,  0,  64 * 1024,  64, 0) },
 	{ "m25p64",  INFO(0x202017,  0,  64 * 1024, 128, 0) },
 	{ "m25p128", INFO(0x202018,  0, 256 * 1024,  64, 0) },
+	{ "n25q032", INFO(0x20ba16,  0,  64 * 1024,  64, 0) },
 
 	{ "m25p05-nonjedec",  INFO(0, 0,  32 * 1024,   2, 0) },
 	{ "m25p10-nonjedec",  INFO(0, 0,  32 * 1024,   4, 0) },