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/x86/include/asm/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/x86/include/asm/gpio.h')
| -rw-r--r-- | arch/x86/include/asm/gpio.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/gpio.h b/arch/x86/include/asm/gpio.h index fe09f31..8bda414 100644 --- a/arch/x86/include/asm/gpio.h +++ b/arch/x86/include/asm/gpio.h @@ -6,6 +6,7 @@ #ifndef _X86_GPIO_H_ #define _X86_GPIO_H_ +#include <asm/arch/gpio.h> #include <asm-generic/gpio.h> #endif /* _X86_GPIO_H_ */ |