summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c
diff options
context:
space:
mode:
authorThomas Doerfler <Thomas.Doerfler@embedded-brains.de>2008-07-14 08:46:06 +0000
committerThomas Doerfler <Thomas.Doerfler@embedded-brains.de>2008-07-14 08:46:06 +0000
commit3c6fe2e7f95f6bff53123df9377b114cadeac874 (patch)
treefef9ad7a4cd45497a1a84c1b7f9cd103eb258c43 /c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c
parentcorrections in display driver (diff)
downloadrtems-3c6fe2e7f95f6bff53123df9377b114cadeac874.tar.bz2
added haleakala BSP contributed by Michael Hamel
Diffstat (limited to 'c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c')
-rw-r--r--c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c b/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c
index e4d35dbfd5..141fdb679c 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c
@@ -18,11 +18,7 @@
\*===============================================================*/
/*
-<<<<<<< bspstart.c
* $Id$
-=======
- * $Id$
->>>>>>> 1.11
*/
#include <bsp.h>