[PATCH] ARM: S3C[24|64]xx: move includes back under <mach/> scope

[Linus Walleij]

On Wed, Jan 15, 2014 at 10:43 AM, Arnd Bergmann <arnd at arndb.de> wrote:
> On Wednesday 15 January 2014 14:41:01 Tushar Behera wrote:
>> > diff --git a/arch/arm/plat-samsung/pm-gpio.c b/arch/arm/plat-samsung/pm-gpio.c
>> > index c4efa1c2a5d1..a9f7a37c4173 100644
>> > --- a/arch/arm/plat-samsung/pm-gpio.c
>> > +++ b/arch/arm/plat-samsung/pm-gpio.c
>> > @@ -19,12 +19,7 @@
>> >  #include <linux/io.h>
>> >  #include <linux/gpio.h>
>> >
>> > -#ifdef CONFIG_ARCH_S3C24XX
>> > -#include <linux/platform_data/gpio-samsung-s3c24xx.h>
>> > -#endif
>> > -#ifdef CONFIG_ARCH_S3C64XX
>> > -#include <linux/platform_data/gpio-samsung-s3c64xx.h>
>> > -#endif
>> > +#include <mach/gpio-samsung.h>
>>
>> This inclusion should be protected by a check for CONFIG_ARCH_S3C24XX
>> || CONFIG_ARCH_S3C64XX. Currently generating build errors for
>> s5p64x0_defconfig, s5pc100_defconfig and s5pv210_defconfig on
>> next-20140115.
>>
>
> I noticed the same problem, but I think a better solution would
> be to do the same change for s5p that Linus has done for s3c,
> which is to move the nonstandard contents of mach/gpio.h to
> mach/gpio-samsung.h.

When I look at it, the issue also exist in e.g.
drivers/gpio/gpio-samsung.c which can be compiled
(like for allyesconfig) when PLAT_SAMSUNG is set.

And it is also set to y for ARCH_EXYNOS... which
doesn't have any custom GPIO header. So this would
involve something like creating an empty
<mach/gpio-samsung.h> for Exynos which doesn't
seem like the right thing to do.

So I'm sticking with the #ifdef patch for now as it
seems to be the lesser evil :-/

Yours,
Linus Walleij