From: Arnd Bergmann <arnd@arndb.de>
To: linux-arm-kernel@vger.kernel.org
Cc: patches@linaro.org, Olof Johansson <olof@lixom.net>,
linux-kernel@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>
Subject: [PATCH 4/6] ARM: l7200: remove zombie file
Date: Thu, 14 Mar 2013 23:12:06 +0100 [thread overview]
Message-ID: <1363299128-8192-5-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1363299128-8192-1-git-send-email-arnd@arndb.de>
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>
---
arch/arm/mach-l7200/include/mach/debug-macro.S | 38 --------------------------
1 file changed, 38 deletions(-)
delete mode 100644 arch/arm/mach-l7200/include/mach/debug-macro.S
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
--
1.8.1.2
next prev parent reply other threads:[~2013-03-14 22:13 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-14 22:12 [PATCH 0/6] ARM platform spring cleaning Arnd Bergmann
2013-03-14 22:12 ` [PATCH 1/6] ARM: gemini: get platform to build again Arnd Bergmann
2013-03-14 22:12 ` [PATCH 2/6] ARM: gemini: remove platform support Arnd Bergmann
2013-03-14 22:12 ` [PATCH 3/6] ARM: remove fa526 CPU support Arnd Bergmann
2013-03-14 22:12 ` Arnd Bergmann [this message]
2013-03-14 22:12 ` [PATCH 5/6] ARM: kill Hynix h720x platform Arnd Bergmann
2013-03-14 22:26 ` Thomas Gleixner
2013-03-14 22:12 ` [PATCH 6/6] mtd: remove h720x flash support Arnd Bergmann
2013-03-14 22:12 ` Arnd Bergmann
-- strict thread matches above, loose matches on Subject: below --
2013-03-14 22:12 [PATCH 0/6] ARM platform spring cleaning Arnd Bergmann
2013-03-14 22:12 ` [PATCH 4/6] ARM: l7200: remove zombie file Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1363299128-8192-5-git-send-email-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=linux-arm-kernel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=olof@lixom.net \
--cc=patches@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.