summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-03-14 21:20:39 +0100
committerArnd Bergmann <arnd@arndb.de>2013-03-19 21:59:08 +0100
commit947906a6848a25a8ea4b09c9067654bb700d1534 (patch)
tree5ff9e1da21cd2b8d460fabc88f5ddf805973a6de /arch/arm
parent662146b155c09d4b1fd01b5a1fb4e8464cce6685 (diff)
downloadop-kernel-dev-947906a6848a25a8ea4b09c9067654bb700d1534.zip
op-kernel-dev-947906a6848a25a8ea4b09c9067654bb700d1534.tar.gz
ARM: l7200: remove zombie file
The l7200 platform was removed in 2.6.35, but one file came back due to a failed merge conflict resolution. Let's kill it again. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-l7200/include/mach/debug-macro.S38
1 files changed, 0 insertions, 38 deletions
diff --git a/arch/arm/mach-l7200/include/mach/debug-macro.S b/arch/arm/mach-l7200/include/mach/debug-macro.S
deleted file mode 100644
index 0b4e760..0000000
--- a/arch/arm/mach-l7200/include/mach/debug-macro.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/* arch/arm/mach-l7200/include/mach/debug-macro.S
- *
- * Debugging macro include header
- *
- * Copyright (C) 1994-1999 Russell King
- * Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
-*/
-
- .equ io_virt, IO_BASE
- .equ io_phys, IO_START
-
- .macro addruart, rp, rv, tmp
- mov \rp, #0x00044000 @ UART1
-@ mov \rp, #0x00045000 @ UART2
- add \rv, \rp, #io_virt @ virtual address
- add \rp, \rp, #io_phys @ physical base address
- .endm
-
- .macro senduart,rd,rx
- str \rd, [\rx, #0x0] @ UARTDR
- .endm
-
- .macro waituart,rd,rx
-1001: ldr \rd, [\rx, #0x18] @ UARTFLG
- tst \rd, #1 << 5 @ UARTFLGUTXFF - 1 when full
- bne 1001b
- .endm
-
- .macro busyuart,rd,rx
-1001: ldr \rd, [\rx, #0x18] @ UARTFLG
- tst \rd, #1 << 3 @ UARTFLGUBUSY - 1 when busy
- bne 1001b
- .endm
OpenPOWER on IntegriCloud