commit 9f1ee150fc7039eb65039ab17d9a95dfa6250133
author Marek Vasut <marek.vasut@gmail.com> Sat Nov 06 23:34:03 2010 +0100
committer Eric Miao <eric.y.miao@gmail.com> Tue Nov 30 20:14:05 2010 +0800
tree a046eb1eb39f36148de40009a1a03adae1f38c18
parent f9d1bf755315a66353a7f42319cff471b36fffb3

ARM: pxa/palm: fix ifdef around gen_nand driver registration

Reported-by: Rafael Gandolfi <kaillasse91@hotmail.fr>
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

arch/arm/mach-pxa/palmtx.c

diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c
index d2060a1..e5c9932 100644
--- a/arch/arm/mach-pxa/palmtx.c
+++ b/arch/arm/mach-pxa/palmtx.c
@@ -241,7 +241,8 @@
 /******************************************************************************
  * NAND Flash
  ******************************************************************************/
-#if defined(CONFIG_MTD_NAND_GPIO) || defined(CONFIG_MTD_NAND_GPIO_MODULE)
+#if defined(CONFIG_MTD_NAND_PLATFORM) || \
+	defined(CONFIG_MTD_NAND_PLATFORM_MODULE)
 static void palmtx_nand_cmd_ctl(struct mtd_info *mtd, int cmd,
 				 unsigned int ctrl)
 {