diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-03-28 18:15:49 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-03-28 18:15:49 +0000 |
| commit | 166247fb9d59625ca1849d020caef3f01601b437 (patch) | |
| tree | 304b071767c94bb68fd3002f30022850f1e19e57 /c/src/lib/libbsp/sparc/leon3/include/amba.h | |
| parent | 2007-03-28 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-166247fb9d59625ca1849d020caef3f01601b437.tar.bz2 | |
2007-03-28 Joel Sherrill <joel@OARcorp.com>
* include/amba.h: Remove CVS conflict marker.
Diffstat (limited to '')
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon3/include/amba.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/c/src/lib/libbsp/sparc/leon3/include/amba.h b/c/src/lib/libbsp/sparc/leon3/include/amba.h index 2701d44daa..fb98df9582 100644 --- a/c/src/lib/libbsp/sparc/leon3/include/amba.h +++ b/c/src/lib/libbsp/sparc/leon3/include/amba.h @@ -10,11 +10,7 @@ * 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 |