[PATCH] PalmTX: Fix ifdef around gen_nand driver registration

Eric Miao eric.y.miao at gmail.com
Mon Nov 8 16:56:43 EST 2010


On Sun, Nov 7, 2010 at 6:34 AM, Marek Vasut <marek.vasut at gmail.com> wrote:
> Reported-by: Rafael Gandolfi <kaillasse91 at hotmail.fr>
> Signed-off-by: Marek Vasut <marek.vasut at gmail.com>

Applied.

> ---
>  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 8943296..595f002 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)
>  {
> --
> 1.7.2.3
>
>



More information about the linux-arm-kernel mailing list