PalmTX: Fix ifdef around gen_nand driver registration
Subsystems (3)
PATCH 1/1 PalmTX: Fix ifdef around gen_nand driver registration
Reported-by Rafael Gandolfi <[email protected]>
Signed-off-by Marek Vasut <[email protected]>
--- arch/arm/mach-pxa/palmtx.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
arch/arm/mach-pxa/palmtx.c +2 -1
@@ -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
Eric Miao
AppliedPATCH 1/1 PalmTX: Fix ifdef around gen_nand driver registration
Quoted 2 lines · Marek Vasut
Reported-by Rafael Gandolfi <[email protected]>Signed-off-by Marek Vasut <[email protected]>
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@@ -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