From patchwork Wed Oct 15 16:39:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soren Brinkmann X-Patchwork-Id: 5086171 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4EFCF9F2BA for ; Wed, 15 Oct 2014 16:43:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 84C6F20127 for ; Wed, 15 Oct 2014 16:43:18 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 528A020115 for ; Wed, 15 Oct 2014 16:43:17 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XeRci-0004ZR-37; Wed, 15 Oct 2014 16:40:28 +0000 Received: from mail-pd0-x234.google.com ([2607:f8b0:400e:c02::234]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XeRcf-0003SO-2j for linux-arm-kernel@lists.infradead.org; Wed, 15 Oct 2014 16:40:25 +0000 Received: by mail-pd0-f180.google.com with SMTP id fp1so1548544pdb.11 for ; Wed, 15 Oct 2014 09:40:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=kbVF3Q3wdxPX30qqgJ3fCnYGYwIAGspTcmTUZ3mqYu8=; b=eeytLEw0XFRCCga4iVIPD6lDoWaU8Vry17M8fIPq8crraNgu0GXxTKM8EB31F8KdAF u2xNH+XUzaFYw6C70AqFMj482JZ4meJsPLExKNrDWjZZeTabb5pC7/TamMPGA3hW/vEA LJ7/UoETE4S6UwB484n64tDIo85OsMxmWl2/etyGIIM4DS/X+sgf4HaZPvIhj3vBoAMh /+S9b2mFeDjEyn72ySpK578lsv1cFCf2DyaLjqScb5wcPfM/lHjLGM4WEkZPxEkG3fAb 2awx+fDobSAJTUZz8zilu9BUoiAoDbp0dsnYsHY3WroxNQhuW/+Qjb2+pWtXAXcbeZX0 9gdA== X-Received: by 10.70.40.173 with SMTP id y13mr14082868pdk.42.1413391201163; Wed, 15 Oct 2014 09:40:01 -0700 (PDT) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id fk10sm17685169pab.29.2014.10.15.09.39.59 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 15 Oct 2014 09:40:00 -0700 (PDT) From: Soren Brinkmann To: Michal Simek Subject: [PATCH] ARM: zynq: Actually remove hotplug.c Date: Wed, 15 Oct 2014 09:39:53 -0700 Message-Id: <1413391193-26710-1-git-send-email-soren.brinkmann@xilinx.com> X-Mailer: git-send-email 2.1.2.1.g5e69ed6 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141015_094025_178392_AFFEE364 X-CRM114-Status: GOOD ( 10.06 ) X-Spam-Score: -0.7 (/) Cc: Soren Brinkmann , Russell King , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit 'ARM: zynq: Remove hotplug.c' (caf86a73eab4132f870e883216850d9eee40b04b) was supposed to remove hotplug.c - but it didn't. It moved all content from hotplug.c elsewhere and removed its entry from the Makefile, but missed to actually remove the whole file. Remove it now. Signed-off-by: Soren Brinkmann --- arch/arm/mach-zynq/Makefile | 2 -- arch/arm/mach-zynq/hotplug.c | 14 -------------- 2 files changed, 16 deletions(-) delete mode 100644 arch/arm/mach-zynq/hotplug.c diff --git a/arch/arm/mach-zynq/Makefile b/arch/arm/mach-zynq/Makefile index c85fb3f7d5cd..b03a97eb7501 100644 --- a/arch/arm/mach-zynq/Makefile +++ b/arch/arm/mach-zynq/Makefile @@ -4,6 +4,4 @@ # Common support obj-y := common.o slcr.o pm.o -CFLAGS_REMOVE_hotplug.o =-march=armv6k -CFLAGS_hotplug.o =-Wa,-march=armv7-a -mcpu=cortex-a9 obj-$(CONFIG_SMP) += headsmp.o platsmp.o diff --git a/arch/arm/mach-zynq/hotplug.c b/arch/arm/mach-zynq/hotplug.c deleted file mode 100644 index b685c89f11e4..000000000000 --- a/arch/arm/mach-zynq/hotplug.c +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (C) 2012-2013 Xilinx - * - * based on linux/arch/arm/mach-realview/hotplug.c - * - * Copyright (C) 2002 ARM Ltd. - * All Rights Reserved - * - * 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. - */ -#include -