projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f9d1bf7
)
ARM: pxa/palm: fix ifdef around gen_nand driver registration
author
Marek Vasut
<
[email protected]
>
Sat, 6 Nov 2010 22:34:03 +0000
(23:34 +0100)
committer
Eric Miao
<
[email protected]
>
Tue, 30 Nov 2010 12:14:05 +0000
(20:14 +0800)
Reported-by: Rafael Gandolfi <
[email protected]
>
Signed-off-by: Marek Vasut <
[email protected]
>
Signed-off-by: Eric Miao <
[email protected]
>
arch/arm/mach-pxa/palmtx.c
patch
|
blob
|
history
diff --git
a/arch/arm/mach-pxa/palmtx.c
b/arch/arm/mach-pxa/palmtx.c
index d2060a1d1d6820bcaf796e1a256a92989ce45365..e5c9932b75887914ec1c95b94692322b98f0e4b1 100644
(file)
--- 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)
{