diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-16 03:29:47 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-16 03:29:47 +0200 |
| commit | cb6a0fd4e4e15a65bb14b142089990df2def038e (patch) | |
| tree | d1d96a0a4fe13dbc6df030c45bdacd6828dcd943 /drivers/gpio | |
| parent | Merge tag 'ux500-core-for-v3.17-1' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | ARM: delete old reference to ARM_GPIOLIB_COMPLEX (diff) | |
| download | linux-cb6a0fd4e4e15a65bb14b142089990df2def038e.tar.xz linux-cb6a0fd4e4e15a65bb14b142089990df2def038e.zip | |
Merge tag 'gpio-h-purge' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio into next/cleanup
This is a purge of all things <mach/gpio.h>, now I never
want to see it again.
- Remove the need for <mach/gpio.h> from S5P
- Kill CONFIG_NEED_MACH_GPIO_H
- Kill remnants of ARM_GPIOLIB_COMPLEX
* tag 'gpio-h-purge' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
ARM: delete old reference to ARM_GPIOLIB_COMPLEX
ARM: kill CONFIG_NEED_MACH_GPIO_H
ARM: mach-s5p: get rid of all <mach/gpio.h> headers
ARM: s5p: cut the custom ARCH_NR_GPIOS definition
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpio-samsung.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c index 7d4281e0d901..d9cff026827e 100644 --- a/drivers/gpio/gpio-samsung.c +++ b/drivers/gpio/gpio-samsung.c @@ -32,10 +32,7 @@ #include <mach/map.h> #include <mach/regs-gpio.h> - -#if defined(CONFIG_ARCH_S3C24XX) || defined(CONFIG_ARCH_S3C64XX) #include <mach/gpio-samsung.h> -#endif #include <plat/cpu.h> #include <plat/gpio-core.h> |