summaryrefslogtreecommitdiff
path: root/cpu/mpc5xx/cpu_init.c
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2008-06-03 20:19:08 +0200
committerStefan Roese <sr@denx.de>2008-06-03 20:19:08 +0200
commit10a3367955bc2033b288915f8f10d0e507fe2fa1 (patch)
treec3ac82364df83db5d5cb963c64b863b77a20445c /cpu/mpc5xx/cpu_init.c
parent97f7d27c8ecf34879d6b747c10fa9a18c02a4cc0 (diff)
parent1f1554841a4c8e069d331176f0c3059fb2bb8280 (diff)
downloadu-boot-imx-10a3367955bc2033b288915f8f10d0e507fe2fa1.zip
u-boot-imx-10a3367955bc2033b288915f8f10d0e507fe2fa1.tar.gz
u-boot-imx-10a3367955bc2033b288915f8f10d0e507fe2fa1.tar.bz2
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'cpu/mpc5xx/cpu_init.c')
-rw-r--r--cpu/mpc5xx/cpu_init.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpu/mpc5xx/cpu_init.c b/cpu/mpc5xx/cpu_init.c
index f4cd24b..5bbb798 100644
--- a/cpu/mpc5xx/cpu_init.c
+++ b/cpu/mpc5xx/cpu_init.c
@@ -23,7 +23,7 @@
* File: cpu_init.c
*
* Discription: Contains initialisation functions to setup
- * the cpu properly
+ * the cpu properly
*
*/
@@ -118,6 +118,6 @@ void cpu_init_f (volatile immap_t * immr)
*/
int cpu_init_r (void)
{
- /* Nothing to do at the moment */
+ /* Nothing to do at the moment */
return (0);
}