Skip to contentSkip to conversation

PalmTX: Fix ifdef around gen_nand driver registration

PATCH New Marek Vasut 2 participants 2 messages Nov 6, 2010 – Nov 8, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PalmTX: Fix ifdef around gen_nand driver registration

---
 arch/arm/mach-pxa/palmtx.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
arch/arm/mach-pxa/palmtx.c +2 -1
index 8943296..595f002 100644
@@ -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)
 {
Signature · 1 line
1.7.2.3
Applied
#1 lore raw

PATCH 1/1 PalmTX: Fix ifdef around gen_nand driver registration

Quoted 2 lines · Marek Vasut

Applied.

Quoted 22 lines

---
?arch/arm/mach-pxa/palmtx.c | ? ?3 ++-
?1 files changed, 2 insertions(+), 1 deletions(-)

arch/arm/mach-pxa/palmtx.c +0 -0
index 8943296..595f002 100644
@@ -241,7 +241,8 @@ static inline void palmtx_keys_init(void) {}

?/****************************************************************************** ?* NAND Flash ?******************************************************************************/

arch/arm/mach-pxa/palmtx.c +2 -1
-#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)
?{
--
1.7.2.3