]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ARM: cns3xxx: Fixup the missing second parameter to addruart macro to allow them...
authorMac Lin <mkl0301@gmail.com>
Sun, 14 Nov 2010 22:17:23 +0000 (22:17 +0000)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 22 Nov 2010 19:00:17 +0000 (11:00 -0800)
It can't be merged into Linus' tree because this file has already been
changed in incompatible ways.

Fixup the missing second parameter to addruart macro to allow them to build,
according to to commit 0e17226f7cd289504724466f4298abc9bdfca3fe.

Enabling DEBUG in head.S would cause:
rch/arm/boot/compressed/head.S: Assembler messages:
arch/arm/boot/compressed/head.S:1037: Error: too many positional arguments
arch/arm/boot/compressed/head.S:1055: Error: too many positional arguments

Signed-off-by: Mac Lin <mkl0301@gmail.com>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
arch/arm/mach-cns3xxx/include/mach/debug-macro.S

index d16ce7eb00e9092a765bc7968e40f7e5d0fb5ee8..9b50442d4b9b9abb68ac4194c946b9abeb3abbf2 100644 (file)
@@ -10,7 +10,7 @@
  * published by the Free Software Foundation.
  */
 
-               .macro  addruart,rx
+               .macro  addruart,rx,rtmp
                mrc     p15, 0, \rx, c1, c0
                tst     \rx, #1                 @ MMU enabled?
                moveq   \rx,      #0x10000000