diff options
| author | Tom Rini <trini@ti.com> | 2014-10-26 14:03:08 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-10-26 14:03:08 -0400 |
| commit | 84a6df09c78bc9e9cbc6265d99c9097f5f1079f2 (patch) | |
| tree | 3b2bf1b3689e9aad0d20f5a69ada168cae3cc769 /arch/arm/dts/dt-bindings/gpio/gpio.h | |
| parent | c69ecd9722af22d50295eff81d0b9cd5b8adc2e0 (diff) | |
| parent | c2ded962d4703a3f9522553004db4a6fe540f7e6 (diff) | |
| download | u-boot-imx-84a6df09c78bc9e9cbc6265d99c9097f5f1079f2.zip u-boot-imx-84a6df09c78bc9e9cbc6265d99c9097f5f1079f2.tar.gz u-boot-imx-84a6df09c78bc9e9cbc6265d99c9097f5f1079f2.tar.bz2 | |
Merge git://git.denx.de/u-boot-dm
Fix a trivial conflict over adding <dm.h>
Conflicts:
arch/arm/cpu/armv7/omap3/board.c
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/arm/dts/dt-bindings/gpio/gpio.h')
| -rw-r--r-- | arch/arm/dts/dt-bindings/gpio/gpio.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/arm/dts/dt-bindings/gpio/gpio.h b/arch/arm/dts/dt-bindings/gpio/gpio.h deleted file mode 100644 index e6b1e0a..0000000 --- a/arch/arm/dts/dt-bindings/gpio/gpio.h +++ /dev/null @@ -1,15 +0,0 @@ -/* - * This header provides constants for most GPIO bindings. - * - * Most GPIO bindings include a flags cell as part of the GPIO specifier. - * In most cases, the format of the flags cell uses the standard values - * defined in this header. - */ - -#ifndef _DT_BINDINGS_GPIO_GPIO_H -#define _DT_BINDINGS_GPIO_GPIO_H - -#define GPIO_ACTIVE_HIGH 0 -#define GPIO_ACTIVE_LOW 1 - -#endif |