3 files changed, 6 insertions, 9 deletions
diff --git a/board/adsvix/Makefile b/board/adsvix/Makefile
index ae514aa0644..24d5d062bcb 100644
--- a/board/adsvix/Makefile
+++ b/board/adsvix/Makefile
@@ -27,7 +27,7 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 
 OBJS	:= adsvix.o pcmcia.o
-SOBJS	:= memsetup.o pxavoltage.o
+SOBJS	:= lowlevel_init.o pxavoltage.o
 
 $(LIB):	$(OBJS) $(SOBJS)
 	$(AR) crv $@ $(OBJS) $(SOBJS)
diff --git a/board/adsvix/memsetup.S b/board/adsvix/lowlevel_init.S
index 7b6abd6b5e5..8dea71c3562 100644
--- a/board/adsvix/memsetup.S
+++ b/board/adsvix/lowlevel_init.S
@@ -5,7 +5,7 @@
  *
  * NOTE: I haven't clean this up considerably, just enough to get it
  * running. See hal_platform_setup.h for the source. See
- * board/cradle/memsetup.S for another PXA250 setup that is
+ * board/cradle/lowlevel_init.S for another PXA250 setup that is
  * much cleaner.
  *
  * See file CREDITS for list of people who contributed to this
@@ -43,8 +43,8 @@
  *	Memory setup
  */
 
-.globl memsetup
-memsetup:
+.globl lowlevel_init
+lowlevel_init:
 
 	/* Set up GPIO pins first ----------------------------------------- */
 
@@ -445,7 +445,6 @@ initclks:
     str r1, [r0]
 	/* FIXME */
 
-// #define NODEBUG
 #ifdef NODEBUG
 	/*Disable software and data breakpoints */
 	mov	r0,#0
@@ -456,13 +455,12 @@ initclks:
 	/*Enable all debug functionality */
 	mov	r0,#0x80000000
 	mcr	p14,0,r0,c10,c0,0  /* dcsr */
-
 #endif
 
 	/* ---------------------------------------------------------------- */
-	/* End memsetup							    */
+	/* End lowlevel_init							    */
 	/* ---------------------------------------------------------------- */
 
-endmemsetup:
+endlowlevel_init:
 
 	mov	pc, lr
diff --git a/board/adsvix/pxavoltage.S b/board/adsvix/pxavoltage.S
index 5a0359c3664..2fe1cabd7c7 100644
--- a/board/adsvix/pxavoltage.S
+++ b/board/adsvix/pxavoltage.S
@@ -228,4 +228,3 @@ setleds:
 	bne		1b
 
 	mov		pc, lr
-