diff options
Diffstat (limited to 'c/src/lib/libbsp/sparc/leon3/include/amba.h')
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon3/include/amba.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/c/src/lib/libbsp/sparc/leon3/include/amba.h b/c/src/lib/libbsp/sparc/leon3/include/amba.h index fb98df9582..2701d44daa 100644 --- a/c/src/lib/libbsp/sparc/leon3/include/amba.h +++ b/c/src/lib/libbsp/sparc/leon3/include/amba.h @@ -10,7 +10,11 @@ * found in the file LICENSE in this distribution or at * http://www.rtems.com/license/LICENSE. * +<<<<<<< amba.h * $Id$ +======= + * $Id$ +>>>>>>> 1.3 */ #define LEON3_IO_AREA 0xfff00000 |