diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-21 16:46:26 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-21 16:46:26 +0200 |
commit | 335332770c68649ffeaf5dc2b58d9cd40041e295 (patch) | |
tree | a48e86b9f9a80913399a182a152b4c580a9c3836 /arch/arm/mach-s5p64x0 | |
parent | 3b3c281073288ebdc6161108bdc4c9f1b08bdee3 (diff) | |
parent | f55be1bf52aad524dc1bf556ae26c90262c87825 (diff) | |
download | blackbird-op-linux-335332770c68649ffeaf5dc2b58d9cd40041e295.tar.gz blackbird-op-linux-335332770c68649ffeaf5dc2b58d9cd40041e295.zip |
Merge branch 'depends/rmk/gpio' into next/board
Conflicts:
arch/arm/mach-at91/board-usb-a9260.c
arch/arm/mach-at91/board-usb-a9263.c
arch/arm/mach-tegra/board-paz00.h
arch/arm/mach-tegra/board-seaboard.h
Diffstat (limited to 'arch/arm/mach-s5p64x0')
-rw-r--r-- | arch/arm/mach-s5p64x0/include/mach/gpio.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-s5p64x0/include/mach/gpio.h b/arch/arm/mach-s5p64x0/include/mach/gpio.h index adb5f298ead8..06cd3c9b16ac 100644 --- a/arch/arm/mach-s5p64x0/include/mach/gpio.h +++ b/arch/arm/mach-s5p64x0/include/mach/gpio.h @@ -13,11 +13,6 @@ #ifndef __ASM_ARCH_GPIO_H #define __ASM_ARCH_GPIO_H __FILE__ -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep -#define gpio_to_irq __gpio_to_irq - /* GPIO bank sizes */ #define S5P6440_GPIO_A_NR (6) @@ -134,6 +129,4 @@ enum s5p6450_gpio_number { #define ARCH_NR_GPIOS (S5P64X0_GPIO_END + CONFIG_SAMSUNG_GPIO_EXTRA) -#include <asm-generic/gpio.h> - #endif /* __ASM_ARCH_GPIO_H */ |