From patchwork Thu Mar 14 22:12:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 15363 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id DA61A23E39 for ; Thu, 14 Mar 2013 22:17:21 +0000 (UTC) Received: from mail-ve0-f180.google.com (mail-ve0-f180.google.com [209.85.128.180]) by fiordland.canonical.com (Postfix) with ESMTP id 95A6BA1820F for ; Thu, 14 Mar 2013 22:17:21 +0000 (UTC) Received: by mail-ve0-f180.google.com with SMTP id jx10so2114309veb.39 for ; Thu, 14 Mar 2013 15:17:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-provags-id:x-gm-message-state; bh=Ls//6jumJ6vbHDKYsmznh7gCNnYCYwGZIdeAdR99Xo4=; b=lF0a7+e8lZSMbjEJU7hL281rctZs/BzYKzXIgssByv7uiRLFK/29BcAzyeSwpd8Ud8 x1buR27uJkkz+P3R9E6v9kyyxIqhJLS/GrbWwOsZ/9epRCOXUWSSXsfmETQVc0KKrm4a zfqzeVtVJcWbPHADSmIGx47CcX7zOQuxisZotXnuV3vUI+nQsHnvR5DzgoJWtdh6Pi9Q gWXd0V1iGbAUImb59a19Ko3jbt0OOOurj2mHQzizW+H4PeSbDY1Qaj3UjmROnw2RdL64 i0RA8CzUK49mk8Mse87x8oH6HvoQgQqQgSk6AZtr0yNNOj4me5S58xSYq3Y9oemn5KDA lVpw== X-Received: by 10.221.11.135 with SMTP id pe7mr4050360vcb.41.1363299440991; Thu, 14 Mar 2013 15:17:20 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp94007veb; Thu, 14 Mar 2013 15:17:20 -0700 (PDT) X-Received: by 10.14.0.73 with SMTP id 49mr11348259eea.21.1363299440080; Thu, 14 Mar 2013 15:17:20 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.17.9]) by mx.google.com with ESMTPS id r44si7392496eeo.217.2013.03.14.15.17.19 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 14 Mar 2013 15:17:20 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.17.9 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.17.9; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.17.9 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de Received: from wuerfel.lan (HSI-KBW-46-223-90-92.hsi.kabel-badenwuerttemberg.de [46.223.90.92]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0LnWsk-1Uwl890kes-00h7Y1; Thu, 14 Mar 2013 23:12:11 +0100 From: Arnd Bergmann To: linux-arm-kernel@vger.kernel.org Cc: patches@linaro.org, Olof Johansson , linux-kernel@vger.kernel.org, Arnd Bergmann Subject: [PATCH 4/6] ARM: l7200: remove zombie file Date: Thu, 14 Mar 2013 23:12:06 +0100 Message-Id: <1363299128-8192-5-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1363299128-8192-1-git-send-email-arnd@arndb.de> References: <1363299128-8192-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:AuK7GhgCBOer8cJUQMHrujl0TaWdkY6D3pRqk2Wvh12 aW1nKjwWPNyShycHRRi8NLyC+9tiorRO/qH+aG6tMBWBKuaEzE i66uiyoqtxGeCGjSHW+skJ5yfJeGNuqWzz8IYpSV1LTN7AGhmz trV475uwk6RpH0tjPUCQS68fVX6aBHpxOv/77vt1xKU0A8kdD6 yAyD2DA0n9u5p+/5YhpXnRmNaWlipOjvwScEGMbheAlO1jwor6 /M3E1elm2MQNwHXUKiS5joBYWFr+N/ls1cpjDKfBVlDSDffUtf qva/wI12i4jRQnAoO3/cX7v49G0UOZOp8uahhVKf2ylkfnfcGG T7crttrtAHSP7oUyX4ZZu5/w3WOH5wOH7Somf+Uud X-Gm-Message-State: ALoCoQmdd4xrCoJzZpxMwa9Jr0TYBKY8mDUogvI9LewdOrp/RS6Cp7nuBYh4wlJ62pjMC9zJdnwi 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 --- 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