diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 22:44:18 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 22:44:18 +0100 |
commit | 43872fa788060eef91ae437957e0a5e39f1c56fd (patch) | |
tree | dba464da61167d84b4f7470edebd5a769a78f9ee /arch/arm/plat-mxc | |
parent | 91fed558d0f33c74477569f50ed883fe6d430f1f (diff) | |
parent | f55be1bf52aad524dc1bf556ae26c90262c87825 (diff) | |
download | linux-3.10-43872fa788060eef91ae437957e0a5e39f1c56fd.tar.gz linux-3.10-43872fa788060eef91ae437957e0a5e39f1c56fd.tar.bz2 linux-3.10-43872fa788060eef91ae437957e0a5e39f1c56fd.zip |
Merge branch 'depends/rmk/gpio' into next/fixes
This sorts out merge conflicts with the arm/gpio branch that
already got merged into mainline Linux.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/plat-mxc')
-rw-r--r-- | arch/arm/plat-mxc/include/mach/gpio.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/plat-mxc/include/mach/gpio.h b/arch/arm/plat-mxc/include/mach/gpio.h index 31c820c1b79..3e1ffc8b8f0 100644 --- a/arch/arm/plat-mxc/include/mach/gpio.h +++ b/arch/arm/plat-mxc/include/mach/gpio.h @@ -21,18 +21,12 @@ #include <linux/spinlock.h> #include <mach/hardware.h> -#include <asm-generic/gpio.h> /* There's a off-by-one betweem the gpio bank number and the gpiochip */ /* range e.g. GPIO_1_5 is gpio 5 under linux */ #define IMX_GPIO_NR(bank, nr) (((bank) - 1) * 32 + (nr)) -/* use gpiolib dispatchers */ -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep - #define gpio_to_irq(gpio) (MXC_GPIO_IRQ_START + (gpio)) #define irq_to_gpio(irq) ((irq) - MXC_GPIO_IRQ_START) |