diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2014-01-14 17:24:24 +0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2014-01-14 18:24:06 +0400 |
| commit | b0161caa72b6ff60f82f5531b9b728f3b6d19e1b (patch) | |
| tree | c995add34bdda3c0b6e9b9fa057b7cedc95fad92 /drivers | |
| parent | ccb6fbb990202e647523a003018f6edaed17b53d (diff) | |
| download | linux-b0161caa72b6ff60f82f5531b9b728f3b6d19e1b.tar.xz | |
ARM: S3C[24|64]xx: move includes back under <mach/> scope
When refactoring and breaking out the includes for the
machine-specific GPIO configuration, two files were created
in <linux/platform_data/gpio-samsung-s3c[24|64]xx.h>, but as
that namespace shall be used for defining data exchanged
between machines and drivers, using it for these broad macros
and config settings is wrong.
Move the headers back into the machine-local
<mach/gpio-samsung.h> file and think about the next step.
Reported-by: Arnd Bergmann <arnd@arndb.de>
Cc: Tomasz Figa <tomasz.figa@gmail.com>
Cc: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: linux-samsung-soc@vger.kernel.org
Acked-by: Mark Brown <broonie@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpio/gpio-samsung.c | 7 | ||||
| -rw-r--r-- | drivers/mmc/host/s3cmci.c | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c index 990754b97f2e..9741cce11df5 100644 --- a/drivers/gpio/gpio-samsung.c +++ b/drivers/gpio/gpio-samsung.c @@ -27,17 +27,12 @@ #include <linux/of.h> #include <linux/slab.h> #include <linux/of_address.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 <asm/irq.h> #include <mach/map.h> #include <mach/regs-gpio.h> +#include <mach/gpio-samsung.h> #include <plat/cpu.h> #include <plat/gpio-core.h> diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c index 11ba3cbb0951..e34d499cb316 100644 --- a/drivers/mmc/host/s3cmci.c +++ b/drivers/mmc/host/s3cmci.c @@ -24,9 +24,9 @@ #include <linux/io.h> #include <mach/dma.h> +#include <mach/gpio-samsung.h> #include <linux/platform_data/mmc-s3cmci.h> -#include <linux/platform_data/gpio-samsung-s3c24xx.h> #include "s3cmci.h" |