diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-09-02 00:44:09 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-09-02 00:44:09 +0200 |
| commit | 6e2fbdea1b26d75314d87c380a36b0015bf824cf (patch) | |
| tree | 921a60d936848d731eb7b6875788bac2ad98009c /lib/fdtdec.c | |
| parent | df95321ca1b06a6271c3959b371848c10019e165 (diff) | |
| parent | 72739219a12bf02820d29a89cb2b7fdc4d0e840f (diff) | |
| download | u-boot-imx-6e2fbdea1b26d75314d87c380a36b0015bf824cf.zip u-boot-imx-6e2fbdea1b26d75314d87c380a36b0015bf824cf.tar.gz u-boot-imx-6e2fbdea1b26d75314d87c380a36b0015bf824cf.tar.bz2 | |
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
* 'agust@denx.de' of git://git.denx.de/u-boot-staging:
tx25: Use generic gpio_* calls
config: Always use GNU ld
tools: add kwboot binary to .gitignore file
fdt: Include arch specific gpio.h instead of asm-generic/gpio.h
serial: CONSOLE macro is not used
Conflicts:
board/karo/tx25/tx25.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'lib/fdtdec.c')
| -rw-r--r-- | lib/fdtdec.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/fdtdec.c b/lib/fdtdec.c index cc09e06..af17ac1 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -24,8 +24,7 @@ #include <libfdt.h> #include <fdtdec.h> -/* we need the generic GPIO interface here */ -#include <asm-generic/gpio.h> +#include <asm/gpio.h> DECLARE_GLOBAL_DATA_PTR; |