summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/sparc/leon3/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'c/src/lib/libbsp/sparc/leon3/ChangeLog')
-rw-r--r--c/src/lib/libbsp/sparc/leon3/ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/c/src/lib/libbsp/sparc/leon3/ChangeLog b/c/src/lib/libbsp/sparc/leon3/ChangeLog
index 3a33f8a030..081989146c 100644
--- a/c/src/lib/libbsp/sparc/leon3/ChangeLog
+++ b/c/src/lib/libbsp/sparc/leon3/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-13 Jerry Needell <jerry.needell@unh.edu>
+
+ * clock/ckinit.c, include/leon.h, timer/timer.c, amba/amba.c
+ fixed up merge from 4.6.6. Correct references to
+ LEON3_IrqCtrl_Regs_Map.mask[x] and LEON3_Timer_Regs_Map.timer[x].
+
2006-07-12 Jerry Needell <jerry.needell@unh.edu>
* amba/amba.c, clock/ckinit.c, include/amba.h, timer/timer.c: Search