summaryrefslogtreecommitdiffstats
path: root/board/freescale
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-10-19 20:58:16 +0200
committerWolfgang Denk <wd@denx.de>2010-10-19 20:58:16 +0200
commit083d506937002f2795c80fe0c3ae194ad2c3d085 (patch)
tree3f7685842824cbd42c290d575d39a7dd3d01bccd /board/freescale
parentb485556be51d1edae0a2c0065e2f572ca42a1eee (diff)
parentb952c24adeb7bfdb09f60d5d1f49fa86a2686c1c (diff)
downloadu-boot-083d506937002f2795c80fe0c3ae194ad2c3d085.tar.gz
u-boot-083d506937002f2795c80fe0c3ae194ad2c3d085.tar.xz
u-boot-083d506937002f2795c80fe0c3ae194ad2c3d085.zip
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/freescale')
-rw-r--r--board/freescale/mx51evk/mx51evk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c
index 84386e6c8f..c8d7d3964e 100644
--- a/board/freescale/mx51evk/mx51evk.c
+++ b/board/freescale/mx51evk/mx51evk.c
@@ -23,7 +23,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/iomux.h>
#include <asm/errno.h>
#include <asm/arch/sys_proto.h>