diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-16 05:29:47 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-16 05:29:47 +0400 |
| commit | cb6a0fd4e4e15a65bb14b142089990df2def038e (patch) | |
| tree | d1d96a0a4fe13dbc6df030c45bdacd6828dcd943 /arch/arm/mach-s5pv210/setup-i2c2.c | |
| parent | e1adcba9c8f6453b1aefababce6810a6866a557c (diff) | |
| parent | 53430333c345c3531f9443d43c6fba1da693abe4 (diff) | |
| download | linux-cb6a0fd4e4e15a65bb14b142089990df2def038e.tar.xz | |
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 'arch/arm/mach-s5pv210/setup-i2c2.c')
| -rw-r--r-- | arch/arm/mach-s5pv210/setup-i2c2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pv210/setup-i2c2.c b/arch/arm/mach-s5pv210/setup-i2c2.c index bbce6c74b915..eff4503b903f 100644 --- a/arch/arm/mach-s5pv210/setup-i2c2.c +++ b/arch/arm/mach-s5pv210/setup-i2c2.c @@ -14,12 +14,12 @@ #include <linux/kernel.h> #include <linux/types.h> -#include <linux/gpio.h> struct platform_device; /* don't need the contents */ #include <linux/platform_data/i2c-s3c2410.h> #include <plat/gpio-cfg.h> +#include <mach/gpio-samsung.h> void s3c_i2c2_cfg_gpio(struct platform_device *dev) { |