All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] mfd: Cleanup mfd-mcp-sa11x0.h header
@ 2013-12-30  6:24 Sachin Kamat
  2014-01-06 11:40 ` Lee Jones
  0 siblings, 1 reply; 2+ messages in thread
From: Sachin Kamat @ 2013-12-30  6:24 UTC (permalink / raw)
  To: linux-kernel; +Cc: lee.jones, sachin.kamat, patches

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 <sachin.kamat@linaro.org>
---
 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 <linux/types.h>
 
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] mfd: Cleanup mfd-mcp-sa11x0.h header
  2013-12-30  6:24 [PATCH] mfd: Cleanup mfd-mcp-sa11x0.h header Sachin Kamat
@ 2014-01-06 11:40 ` Lee Jones
  0 siblings, 0 replies; 2+ messages in thread
From: Lee Jones @ 2014-01-06 11:40 UTC (permalink / raw)
  To: Sachin Kamat; +Cc: linux-kernel, patches

On Mon, 30 Dec 2013, Sachin Kamat wrote:

> 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 <sachin.kamat@linaro.org>
> ---
>  include/linux/platform_data/mfd-mcp-sa11x0.h |    6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)

Applied, thanks.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-01-06 11:40 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-12-30  6:24 [PATCH] mfd: Cleanup mfd-mcp-sa11x0.h header Sachin Kamat
2014-01-06 11:40 ` Lee Jones

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.