diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-19 20:58:16 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-19 20:58:16 +0200 |
| commit | 083d506937002f2795c80fe0c3ae194ad2c3d085 (patch) | |
| tree | 3f7685842824cbd42c290d575d39a7dd3d01bccd /board/ttcontrol | |
| parent | b485556be51d1edae0a2c0065e2f572ca42a1eee (diff) | |
| parent | b952c24adeb7bfdb09f60d5d1f49fa86a2686c1c (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-imx
Conflicts:
board/logicpd/imx31_litekit/config.mk
boards.cfg
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board/ttcontrol')
| -rw-r--r-- | board/ttcontrol/vision2/vision2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/ttcontrol/vision2/vision2.c b/board/ttcontrol/vision2/vision2.c index c991ee271e..ce4cb78e98 100644 --- a/board/ttcontrol/vision2/vision2.c +++ b/board/ttcontrol/vision2/vision2.c @@ -26,7 +26,7 @@ #include <common.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> -#include <asm/arch/mx51_pins.h> +#include <asm/arch/mx5x_pins.h> #include <asm/arch/crm_regs.h> #include <asm/arch/iomux.h> #include <mxc_gpio.h> |