diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-07-26 18:00:40 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-07-26 18:00:40 +0200 |
| commit | dffd7e35a50d1f8fd79805dd10d412a041f67cb3 (patch) | |
| tree | b25288791cf5fb95b5baca5b93f26f149f5ec6e0 /arch/arm/include/asm/gpio.h | |
| parent | 944483d0330bb497549977aa9649be6b7d0ede37 (diff) | |
| parent | 53430333c345c3531f9443d43c6fba1da693abe4 (diff) | |
| download | lwn-dffd7e35a50d1f8fd79805dd10d412a041f67cb3.tar.gz lwn-dffd7e35a50d1f8fd79805dd10d412a041f67cb3.zip | |
Merge branch 'cleanup/gpio-header-removal' into next/soc
* cleanup/gpio-header-removal:
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
This resolves a massive amount of conflicts between the
mach/gpio.h removal and the s5p platform removal.
Almost all changes are trivial, as both sides remove
stuff.
Conflicts:
arch/arm/Kconfig
arch/arm/mach-s5p64x0/common.c
arch/arm/mach-s5p64x0/dev-audio.c
arch/arm/mach-s5p64x0/include/mach/gpio-samsung.h
arch/arm/mach-s5p64x0/mach-smdk6440.c
arch/arm/mach-s5p64x0/mach-smdk6450.c
arch/arm/mach-s5p64x0/setup-fb-24bpp.c
arch/arm/mach-s5p64x0/setup-i2c0.c
arch/arm/mach-s5p64x0/setup-i2c1.c
arch/arm/mach-s5p64x0/setup-sdhci-gpio.c
arch/arm/mach-s5p64x0/setup-spi.c
arch/arm/mach-s5pc100/dev-audio.c
arch/arm/mach-s5pc100/include/mach/gpio-samsung.h
arch/arm/mach-s5pc100/mach-smdkc100.c
arch/arm/mach-s5pc100/setup-fb-24bpp.c
arch/arm/mach-s5pc100/setup-i2c0.c
arch/arm/mach-s5pc100/setup-i2c1.c
arch/arm/mach-s5pc100/setup-ide.c
arch/arm/mach-s5pc100/setup-keypad.c
arch/arm/mach-s5pc100/setup-sdhci-gpio.c
arch/arm/mach-s5pc100/setup-spi.c
arch/arm/mach-s5pv210/dev-audio.c
arch/arm/mach-s5pv210/include/mach/gpio-samsung.h
arch/arm/mach-s5pv210/mach-aquila.c
arch/arm/mach-s5pv210/mach-goni.c
arch/arm/mach-s5pv210/mach-smdkv210.c
arch/arm/mach-s5pv210/setup-fb-24bpp.c
arch/arm/mach-s5pv210/setup-fimc.c
arch/arm/mach-s5pv210/setup-i2c0.c
arch/arm/mach-s5pv210/setup-i2c1.c
arch/arm/mach-s5pv210/setup-i2c2.c
arch/arm/mach-s5pv210/setup-ide.c
arch/arm/mach-s5pv210/setup-keypad.c
arch/arm/mach-s5pv210/setup-sdhci-gpio.c
arch/arm/mach-s5pv210/setup-spi.c
arch/arm/plat-samsung/Kconfig
arch/arm/plat-samsung/s5p-irq-eint.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/include/asm/gpio.h')
| -rw-r--r-- | arch/arm/include/asm/gpio.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h index 477e0206e016..504dcddebfcc 100644 --- a/arch/arm/include/asm/gpio.h +++ b/arch/arm/include/asm/gpio.h @@ -5,12 +5,6 @@ #define ARCH_NR_GPIOS CONFIG_ARCH_NR_GPIO #endif -/* not all ARM platforms necessarily support this API ... */ -#ifdef CONFIG_NEED_MACH_GPIO_H -#include <mach/gpio.h> -#endif - -#ifndef __ARM_GPIOLIB_COMPLEX /* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h */ #include <asm-generic/gpio.h> @@ -18,7 +12,6 @@ #define gpio_get_value __gpio_get_value #define gpio_set_value __gpio_set_value #define gpio_cansleep __gpio_cansleep -#endif /* * Provide a default gpio_to_irq() which should satisfy every case. |