diff options
| author | Marek Vasut <marek.vasut@gmail.com> | 2010-11-06 18:34:03 -0400 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2010-11-30 07:14:05 -0500 |
| commit | 9f1ee150fc7039eb65039ab17d9a95dfa6250133 (patch) | |
| tree | a046eb1eb39f36148de40009a1a03adae1f38c18 /arch | |
| parent | f9d1bf755315a66353a7f42319cff471b36fffb3 (diff) | |
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')
| -rw-r--r-- | arch/arm/mach-pxa/palmtx.c | 3 |
1 files changed, 2 insertions, 1 deletions
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) {} | |||
| 241 | /****************************************************************************** | 241 | /****************************************************************************** |
| 242 | * NAND Flash | 242 | * NAND Flash |
| 243 | ******************************************************************************/ | 243 | ******************************************************************************/ |
| 244 | #if defined(CONFIG_MTD_NAND_GPIO) || defined(CONFIG_MTD_NAND_GPIO_MODULE) | 244 | #if defined(CONFIG_MTD_NAND_PLATFORM) || \ |
| 245 | defined(CONFIG_MTD_NAND_PLATFORM_MODULE) | ||
| 245 | static void palmtx_nand_cmd_ctl(struct mtd_info *mtd, int cmd, | 246 | static void palmtx_nand_cmd_ctl(struct mtd_info *mtd, int cmd, |
| 246 | unsigned int ctrl) | 247 | unsigned int ctrl) |
| 247 | { | 248 | { |