diff options
Diffstat (limited to 'c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c b/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c index 141fdb679c..e4d35dbfd5 100644 --- a/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c @@ -18,7 +18,11 @@ \*===============================================================*/ /* +<<<<<<< bspstart.c * $Id$ +======= + * $Id$ +>>>>>>> 1.11 */ #include <bsp.h> |