summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut@gmail.com>2010-11-06 23:34:03 +0100
committerEric Miao <eric.y.miao@gmail.com>2010-11-30 20:14:05 +0800
commit9f1ee150fc7039eb65039ab17d9a95dfa6250133 (patch)
treea046eb1eb39f36148de40009a1a03adae1f38c18 /arch/arm/mach-pxa
parentf9d1bf755315a66353a7f42319cff471b36fffb3 (diff)
downloadop-kernel-dev-9f1ee150fc7039eb65039ab17d9a95dfa6250133.zip
op-kernel-dev-9f1ee150fc7039eb65039ab17d9a95dfa6250133.tar.gz
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>
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r--arch/arm/mach-pxa/palmtx.c3
1 files changed, 2 insertions, 1 deletions
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 @@ 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)
{
OpenPOWER on IntegriCloud