Merge branch 'linus' into locking-for-linus

[sfrench/cifs-2.6.git] / arch / arm / mach-shark / include / mach / debug-macro.S

diff --git a/arch/arm/mach-shark/include/mach/debug-macro.S b/arch/arm/mach-shark/include/mach/debug-macro.S
index 0836cb78b29ac5549e1c3b76858140895937d368..f97a7626bd587d39884e160e0877be571382e5f2 100644 (file)
--- a/arch/arm/mach-shark/include/mach/debug-macro.S
+++ b/arch/arm/mach-shark/include/mach/debug-macro.S
@@ -27,5 +27,3 @@
                bne     1001b
                .endm
 
-               .macro  waituart,rd,rx
-               .endm