From 28acc88be9bff6f9aef28f392148c247d12cf04d Mon Sep 17 00:00:00 2001
From: Guillaume LECERF <glecerf@gmail.com>
Date: Sat, 24 Apr 2010 17:58:07 +0200
Subject: [PATCH] --- yaml --- r: 195953 b: refs/heads/master c:
 58598861227877bb481b9035d2a07283577a2274 h: refs/heads/master i:   195951:
 b997e22d921eae9b73f5e5aa9b9fa1ed86cca8b1 v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/mtd/chips/gen_probe.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 29192e975933..813417c07d21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54b93a49d8dd90dfb658f21a3316527fe6195106
+refs/heads/master: 58598861227877bb481b9035d2a07283577a2274
diff --git a/trunk/drivers/mtd/chips/gen_probe.c b/trunk/drivers/mtd/chips/gen_probe.c
index fcc1bc02c8a2..1d56887c839b 100644
--- a/trunk/drivers/mtd/chips/gen_probe.c
+++ b/trunk/drivers/mtd/chips/gen_probe.c
@@ -241,17 +241,17 @@ static struct mtd_info *check_cmd_set(struct map_info *map, int primary)
 		/* We need these for the !CONFIG_MODULES case,
 		   because symbol_get() doesn't work there */
 #ifdef CONFIG_MTD_CFI_INTELEXT
-	case 0x0001:
-	case 0x0003:
-	case 0x0200:
+	case P_ID_INTEL_EXT:
+	case P_ID_INTEL_STD:
+	case P_ID_INTEL_PERFORMANCE:
 		return cfi_cmdset_0001(map, primary);
 #endif
 #ifdef CONFIG_MTD_CFI_AMDSTD
-	case 0x0002:
+	case P_ID_AMD_STD:
 		return cfi_cmdset_0002(map, primary);
 #endif
 #ifdef CONFIG_MTD_CFI_STAA
-        case 0x0020:
+        case P_ID_ST_ADV:
 		return cfi_cmdset_0020(map, primary);
 #endif
 	default: