diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:24:28 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:24:28 +0100 |
| commit | 7e0cac630c7c90f12a78131df9913657fa30243b (patch) | |
| tree | c09aa76b07a9bcb0ab0dea4885909421f7a9f4a6 /arch/arm/mach-mxs/include/mach/gpio.h | |
| parent | 94314a40bcc537c396012e37cf887572f0d82aef (diff) | |
| parent | b4cbb8a4e602ea77b0525d06eff89c6a6070dab3 (diff) | |
| download | talos-op-linux-7e0cac630c7c90f12a78131df9913657fa30243b.tar.gz talos-op-linux-7e0cac630c7c90f12a78131df9913657fa30243b.zip | |
Merge branch 'imx/devel' into imx/imx6q
Conflicts:
arch/arm/plat-mxc/include/mach/memory.h
Diffstat (limited to 'arch/arm/mach-mxs/include/mach/gpio.h')
| -rw-r--r-- | arch/arm/mach-mxs/include/mach/gpio.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-mxs/include/mach/gpio.h b/arch/arm/mach-mxs/include/mach/gpio.h index 828ccccb6aad..56025aa0a639 100644 --- a/arch/arm/mach-mxs/include/mach/gpio.h +++ b/arch/arm/mach-mxs/include/mach/gpio.h @@ -22,14 +22,10 @@ #include <asm-generic/gpio.h> -#define MXS_GPIO_NR(bank, nr) ((bank) * 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_to_irq -#define irq_to_gpio(irq) ((irq) - MXS_GPIO_IRQ_START) - #endif /* __MACH_MXS_GPIO_H__ */ |
