Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

dsp56k/bootstrap.asm

@@ -51,19 +51,19 @@ start   jmp     <$40
         ; Copy DSP program control
         move    #real,r0
         move    #upload,r1
-        do      #upload_end-upload,<_copy
+        do      #upload_end-upload,_copy
-        move    P:(r0)+,x0
+        movem    P:(r0)+,x0
-        move    x0,P:(r1)+
+        movem    x0,P:(r1)+
-_copy   movep   #>4,X:<<M_HCR
+_copy   movep   #4,X:<<M_HCR
-        movep   #>$c00,X:<<M_IPR
+        movep   #$c00,X:<<M_IPR
         and     #<$fe,mr
         jmp     upload
 
 real
         org     P:$7ea9
 upload
-        movep   #>1,X:<<M_PBC
+        movep   #1,X:<<M_PBC
-        movep   #>0,X:<<M_BCR
+        movep   #0,X:<<M_BCR
 
 next    jclr    #0,X:<<M_HSR,*
         movep   X:<<M_HRX,A
@@ -81,18 +81,18 @@ _get_length
         cmp     x0,A
         jeq     load_Y
 
-load_P  do      y0,_load
+load_P  do      y0,_load_P
         jclr    #0,X:<<M_HSR,*
         movep   X:<<M_HRX,P:(r0)+
-_load   jmp     next
+_load_P jmp     next
-load_X  do      y0,_load
+load_X  do      y0,_load_X
         jclr    #0,X:<<M_HSR,*
         movep   X:<<M_HRX,X:(r0)+
-_load   jmp     next
+_load_X jmp     next
-load_Y  do      y0,_load
+load_Y  do      y0,_load_Y
         jclr    #0,X:<<M_HSR,*
         movep   X:<<M_HRX,Y:(r0)+
-_load   jmp     next
+_load_Y jmp     next
 
 upload_end
         end