From: Marek Vasut <marek.vasut@gmail.com>
Date: Sat, 6 Nov 2010 22:34:03 +0000 (+0100)
Subject: ARM: pxa/palm: fix ifdef around gen_nand driver registration
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9f1ee150fc7039eb65039ab17d9a95dfa6250133;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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>
---

diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c
index d2060a1d1d68..e5c9932b7588 100644
--- a/arch/arm/mach-pxa/palmtx.c
+++ b/arch/arm/mach-pxa/palmtx.c
@@ -241,7 +241,8 @@ static inline void palmtx_keys_init(void) {}
 /******************************************************************************
  * 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)
 {