From patchwork Thu Sep 26 09:26:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 20576 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f70.google.com (mail-yh0-f70.google.com [209.85.213.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3DF0224687 for ; Thu, 26 Sep 2013 09:27:27 +0000 (UTC) Received: by mail-yh0-f70.google.com with SMTP id i72sf736069yha.1 for ; Thu, 26 Sep 2013 02:27:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=zKJiqRJE2KG2P86dOLYNpjoMGFggF3vQ7yWsbEIo63Y=; b=Hdhk27OGPNbzIk3se9+ZdfQ9xuiJmxCDxUIVNwRXg9Fkf37tSxcjQzWRmt070i4wPa sl2b8l5bV5LD8p6+AHKc4u6lgM2kg/ienkJz8R+k4z3LOghg55Gyic6K0izj9UsePxeU 1Ribknmn+MO24v5czpJCDLpx4hapHz6x9PjWXNqaQPTrQVEo60uHWYVXWvT+puBiBX1n VhQWL0BSljn45QF1QBaBb16jhjfPPDSMQK/BTVNvf09a0p1BJCeMBbuFBEW2fX2GF16W DWzdMZjhMhNa0d9r5hiGOljnKoKvkmpJfsh376UubwDTuIYc+SOVnUvgA7gytUJfxj+y MlNw== X-Gm-Message-State: ALoCoQmKRpMnnmCzNOdOIwZeAZ3Zn/IiNWR3J/UZrVudgpC9vbKiiV5tZeZjt98sl4TdAo3/MFYZ X-Received: by 10.236.32.74 with SMTP id n50mr11261684yha.13.1380187646774; Thu, 26 Sep 2013 02:27:26 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.116.228 with SMTP id jz4ls791384qeb.51.gmail; Thu, 26 Sep 2013 02:27:26 -0700 (PDT) X-Received: by 10.220.11.7 with SMTP id r7mr11129vcr.12.1380187646630; Thu, 26 Sep 2013 02:27:26 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id dp7si163403ved.35.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 02:27:26 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id if17so629203vcb.18 for ; Thu, 26 Sep 2013 02:26:56 -0700 (PDT) X-Received: by 10.58.128.71 with SMTP id nm7mr16033veb.51.1380187616435; Thu, 26 Sep 2013 02:26:56 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp355134vcz; Thu, 26 Sep 2013 02:26:55 -0700 (PDT) X-Received: by 10.15.31.200 with SMTP id y48mr47431eeu.153.1380187614892; Thu, 26 Sep 2013 02:26:54 -0700 (PDT) Received: from mail-ea0-f173.google.com (mail-ea0-f173.google.com [209.85.215.173]) by mx.google.com with ESMTPS id e49si593819eep.261.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 02:26:54 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.173 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=209.85.215.173; Received: by mail-ea0-f173.google.com with SMTP id g10so397710eak.4 for ; Thu, 26 Sep 2013 02:26:54 -0700 (PDT) X-Received: by 10.14.119.196 with SMTP id n44mr51140eeh.116.1380187614058; Thu, 26 Sep 2013 02:26:54 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id h52sm1751210eez.3.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 26 Sep 2013 02:26:53 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Cc: Linus Walleij , Lee Jones Subject: [PATCH] ARM: ux500: delete devices-common remnants Date: Thu, 26 Sep 2013 11:26:48 +0200 Message-Id: <1380187608-26492-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.3.1 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , commit f1ff5b2549990b5de080b52e3313cbb30c218853 "ARM: ux500: Stop enabling GPIOs when not booting with Device Tree" deleted devices-common.c, but did not delete the build rule from Makefile (most likely due to compiling in a dirty tree where the object file still existed so linking would complete anyway). Delete the makerule, the header file associated with this file and the remaining reference to the header. Cc: Lee Jones Signed-off-by: Linus Walleij --- arch/arm/mach-ux500/Makefile | 3 +-- arch/arm/mach-ux500/devices-common.h | 15 --------------- arch/arm/mach-ux500/devices-db8500.h | 1 - 3 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 arch/arm/mach-ux500/devices-common.h diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile index e4ed820..616b96e 100644 --- a/arch/arm/mach-ux500/Makefile +++ b/arch/arm/mach-ux500/Makefile @@ -2,8 +2,7 @@ # Makefile for the linux kernel, U8500 machine. # -obj-y := cpu.o devices.o devices-common.o \ - id.o timer.o pm.o +obj-y := cpu.o devices.o id.o timer.o pm.o obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o obj-$(CONFIG_UX500_SOC_DB8500) += cpu-db8500.o devices-db8500.o obj-$(CONFIG_MACH_MOP500) += board-mop500.o board-mop500-sdi.o \ diff --git a/arch/arm/mach-ux500/devices-common.h b/arch/arm/mach-ux500/devices-common.h deleted file mode 100644 index f3f7349..0000000 --- a/arch/arm/mach-ux500/devices-common.h +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (C) ST-Ericsson SA 2010 - * - * Author: Rabin Vincent for ST-Ericsson - * License terms: GNU General Public License (GPL), version 2. - */ - -#ifndef __DEVICES_COMMON_H -#define __DEVICES_COMMON_H - -#include -#include -#include - -#endif diff --git a/arch/arm/mach-ux500/devices-db8500.h b/arch/arm/mach-ux500/devices-db8500.h index 6d59218..b8ffc99 100644 --- a/arch/arm/mach-ux500/devices-db8500.h +++ b/arch/arm/mach-ux500/devices-db8500.h @@ -10,7 +10,6 @@ #include "irqs.h" #include "db8500-regs.h" -#include "devices-common.h" struct platform_device;