diff options
| author | Michal Simek <monstr@monstr.eu> | 2007-05-08 00:32:35 +0200 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2007-05-08 00:32:35 +0200 |
| commit | 3c4bd60de15d79ddfc0cf3170a55847b2025d93f (patch) | |
| tree | 891b84b58f13a5f45536a243585b9d94c253a410 /cpu/microblaze | |
| parent | fb05f6da35ea1c15c553abe6f23f656bf18dc5db (diff) | |
| parent | ac4cd59d59c9bf3f89cb7a344abf8184d678f562 (diff) | |
Merge git://www.denx.de/git/u-boot
Conflicts:
include/asm-microblaze/microblaze_intc.h
include/linux/stat.h
Diffstat (limited to 'cpu/microblaze')
| -rw-r--r-- | cpu/microblaze/start.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/microblaze/start.S b/cpu/microblaze/start.S index 453815818..3c027ff9b 100644 --- a/cpu/microblaze/start.S +++ b/cpu/microblaze/start.S @@ -54,7 +54,7 @@ _start: lhu r7, r1, r0 shi r7, r0, 0x2 shi r6, r0, 0x6 -/* +/* * Copy U-Boot code to TEXT_BASE * solve problem with sbrk_base */ |