Re: [PATCH 28/33] Removing dead CPU_S3C24XX

[Vasily Khoruzhick]

Ð ÑÐÐÐÑÐÐÐÐ ÐÑ 30 ÐÑÐÑ 2010 19:02:51 ÐÐÑÐÑ Christoph Egger ÐÐÐÐÑÐÐ:
> CPU_S3C24XX doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
> 
> Signed-off-by: Christoph Egger <siccegge@xxxxxxxxx>
> ---
>  arch/arm/mach-s3c2410/include/mach/gpio.h |    4 ----
>  1 files changed, 0 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/mach-s3c2410/include/mach/gpio.h
> b/arch/arm/mach-s3c2410/include/mach/gpio.h index b649bf2..a37d274 100644
> --- a/arch/arm/mach-s3c2410/include/mach/gpio.h
> +++ b/arch/arm/mach-s3c2410/include/mach/gpio.h
> @@ -30,8 +30,4 @@
>  #include <mach/gpio-nrs.h>
>  #include <mach/gpio-fns.h>
> 
> -#ifdef CONFIG_CPU_S3C24XX
> -#define S3C_GPIO_END	(S3C2410_GPIO_BANKJ + 32)
> -#else
>  #define S3C_GPIO_END	(S3C2410_GPIO_BANKH + 32)
> -#endif

This patch conflicts with Yaugen Kharuzhy patch (ARM: S3C24XX: Fix gpiolib 
support for ports K..M), S3C24XX is just a typo, it should be S3C244X and that 
was fixed by mentioned patch

Regards
Vasily

Attachment: signature.asc
Description: This is a digitally signed message part.