From patchwork Mon Dec 30 06:24:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 22791 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f71.google.com (mail-qe0-f71.google.com [209.85.128.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 543E323FDF for ; Mon, 30 Dec 2013 06:28:35 +0000 (UTC) Received: by mail-qe0-f71.google.com with SMTP id b10sf13932543qen.6 for ; Sun, 29 Dec 2013 22:28:34 -0800 (PST) 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=eqNDRbwARWbvgu1NSagnnJkASwz1Ewb/kJO11FkFDYA=; b=Vq+x7+Q5jAmB5V4jqLh0td3uXmZ6dW+deLLn76yxE4nWbzAO11+SzhlnxDQrf1DSvm WEz3dfhfmKqQZ0MKSsXhBq5aLIrKyRtq7u8tLy8fEUZZTOUvaCJQBwCzPC4dUb++0Ub+ BSpLxGwO/whWExE/7vDtxt9ZoH4dqN/cOwR4VKHA3wJ9eoDPzGa63HsY81Cbh4Cbx111 UAUOpnVCzEtjF5N002ccV7aNHJS4DGvMjfjc8lc8yKJ0B5YwSlCvNGXcqapdK7iheQ/N aa9AyTIXJlM6HdtaSI+dtWKsaPeG6KHrs7q251Qw+C9mYciQqwwsxDQTbMu+7cVXdLTr CD5g== X-Gm-Message-State: ALoCoQmArWaYo4ztTUwgIr7Z8YdZr22Mxg89b2K8sKW4g2RyaWP3qj+IBD5iQbCMVHN5822DMRHW X-Received: by 10.52.184.228 with SMTP id ex4mr22159858vdc.1.1388384914123; Sun, 29 Dec 2013 22:28:34 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.4.138 with SMTP id k10ls3460861qek.13.gmail; Sun, 29 Dec 2013 22:28:34 -0800 (PST) X-Received: by 10.58.19.195 with SMTP id h3mr692133vee.48.1388384914010; Sun, 29 Dec 2013 22:28:34 -0800 (PST) Received: from mail-vb0-f44.google.com (mail-vb0-f44.google.com [209.85.212.44]) by mx.google.com with ESMTPS id tj7si16286914vdc.72.2013.12.29.22.28.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 29 Dec 2013 22:28:34 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.44 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.44; Received: by mail-vb0-f44.google.com with SMTP id x8so5686215vbf.31 for ; Sun, 29 Dec 2013 22:28:33 -0800 (PST) X-Received: by 10.220.53.135 with SMTP id m7mr34724158vcg.12.1388384913950; Sun, 29 Dec 2013 22:28:33 -0800 (PST) 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.59.13.131 with SMTP id ey3csp588206ved; Sun, 29 Dec 2013 22:28:33 -0800 (PST) X-Received: by 10.66.121.164 with SMTP id ll4mr67845032pab.48.1388384913107; Sun, 29 Dec 2013 22:28:33 -0800 (PST) Received: from mail-pa0-f51.google.com (mail-pa0-f51.google.com [209.85.220.51]) by mx.google.com with ESMTPS id xu5si32547501pab.196.2013.12.29.22.28.32 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 29 Dec 2013 22:28:33 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.51 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.220.51; Received: by mail-pa0-f51.google.com with SMTP id fa1so11381813pad.10 for ; Sun, 29 Dec 2013 22:28:32 -0800 (PST) X-Received: by 10.68.136.34 with SMTP id px2mr66377345pbb.113.1388384912640; Sun, 29 Dec 2013 22:28:32 -0800 (PST) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id ir5sm30712846pbc.14.2013.12.29.22.28.29 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 29 Dec 2013 22:28:32 -0800 (PST) From: Sachin Kamat To: linux-kernel@vger.kernel.org Cc: lee.jones@linaro.org, sachin.kamat@linaro.org, patches@linaro.org Subject: [PATCH] mfd: Cleanup mfd-mcp-sa11x0.h header Date: Mon, 30 Dec 2013 11:54:56 +0530 Message-Id: <1388384696-24291-1-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: sachin.kamat@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.44 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 a1fd844c6e62 ("ARM: sa1100: move platform_data definitions") moved the file to the current location but forgot to remove the pointer to its previous location. Clean it up. While at it also change the header file protection macros appropriately. Signed-off-by: Sachin Kamat --- include/linux/platform_data/mfd-mcp-sa11x0.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/include/linux/platform_data/mfd-mcp-sa11x0.h b/include/linux/platform_data/mfd-mcp-sa11x0.h index 4b2860ae3828..747cd6baf711 100644 --- a/include/linux/platform_data/mfd-mcp-sa11x0.h +++ b/include/linux/platform_data/mfd-mcp-sa11x0.h @@ -1,14 +1,12 @@ /* - * arch/arm/mach-sa1100/include/mach/mcp.h - * * Copyright (C) 2005 Russell King. * * 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. */ -#ifndef __ASM_ARM_ARCH_MCP_H -#define __ASM_ARM_ARCH_MCP_H +#ifndef __MFD_MCP_SA11X0_H +#define __MFD_MCP_SA11X0_H #include