projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.denx.de/u-boot-coldfire
[oweals/u-boot.git]
/
cpu
/
arm926ejs
/
start.S
diff --git
a/cpu/arm926ejs/start.S
b/cpu/arm926ejs/start.S
index ed4932a13680f26fdf0605aec8f94d63d6624575..8043322583a8870869dfa67c768b60dcf0f020ef 100644
(file)
--- a/
cpu/arm926ejs/start.S
+++ b/
cpu/arm926ejs/start.S
@@
-7,7
+7,7
@@
*
* Copyright (c) 2001 Marius Gröger <mag@sysgo.de>
* Copyright (c) 2002 Alex Züpke <azu@sysgo.de>
*
* Copyright (c) 2001 Marius Gröger <mag@sysgo.de>
* Copyright (c) 2002 Alex Züpke <azu@sysgo.de>
- * Copyright (c) 2002 Gary Jennejohn <gj@denx.de>
+ * Copyright (c) 2002 Gary Jennejohn <g
ary
j@denx.de>
* Copyright (c) 2003 Richard Woodruff <r-woodruff2@ti.com>
* Copyright (c) 2003 Kshitij <kshitij@ti.com>
*
* Copyright (c) 2003 Richard Woodruff <r-woodruff2@ti.com>
* Copyright (c) 2003 Kshitij <kshitij@ti.com>
*
@@
-32,6
+32,7
@@
#include <config.h>
#include <config.h>
+#include <common.h>
#include <version.h>
#if defined(CONFIG_OMAP1610)
#include <version.h>
#if defined(CONFIG_OMAP1610)