All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/1] i2c: s3c2410: Trivial cleanup in header file
@ 2014-02-14  6:31 Sachin Kamat
       [not found] ` <1392359490-9834-1-git-send-email-sachin.kamat-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
  0 siblings, 1 reply; 3+ messages in thread
From: Sachin Kamat @ 2014-02-14  6:31 UTC (permalink / raw)
  To: linux-i2c-u79uwXL29TY76Z2rM5mHXA
  Cc: wsa-z923LK4zBo2bacvFa/9K2g, trivial-DgEjT+Ai2ygdnm+yROfE0A,
	sachin.kamat-QSEj5FYQhm4dnm+yROfE0A

Commit 436d42c61c3e ("ARM: samsung: move platform_data definitions")
moved the files 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-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
---
 include/linux/platform_data/i2c-s3c2410.h |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/include/linux/platform_data/i2c-s3c2410.h b/include/linux/platform_data/i2c-s3c2410.h
index 2a50048c1c44..05af66b840b9 100644
--- a/include/linux/platform_data/i2c-s3c2410.h
+++ b/include/linux/platform_data/i2c-s3c2410.h
@@ -1,5 +1,4 @@
-/* arch/arm/plat-s3c/include/plat/iic.h
- *
+/*
  * Copyright 2004-2009 Simtec Electronics
  *	Ben Dooks <ben-Y5A6D6n0/KfQXOPxS62xeg@public.gmane.org>
  *
@@ -10,8 +9,8 @@
  * published by the Free Software Foundation.
 */
 
-#ifndef __ASM_ARCH_IIC_H
-#define __ASM_ARCH_IIC_H __FILE__
+#ifndef __I2C_S3C2410_H
+#define __I2C_S3C2410_H __FILE__
 
 #define S3C_IICFLG_FILTER	(1<<0)	/* enable s3c2440 filter */
 
@@ -76,4 +75,4 @@ extern void s3c_i2c7_cfg_gpio(struct platform_device *dev);
 
 extern struct s3c2410_platform_i2c default_i2c_data;
 
-#endif /* __ASM_ARCH_IIC_H */
+#endif /* __I2C_S3C2410_H */
-- 
1.7.9.5

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

* Re: [PATCH 1/1] i2c: s3c2410: Trivial cleanup in header file
       [not found] ` <1392359490-9834-1-git-send-email-sachin.kamat-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
@ 2014-03-10 15:25   ` Sachin Kamat
  2014-03-10 16:33   ` Wolfram Sang
  1 sibling, 0 replies; 3+ messages in thread
From: Sachin Kamat @ 2014-03-10 15:25 UTC (permalink / raw)
  To: linux-i2c-u79uwXL29TY76Z2rM5mHXA; +Cc: Wolfram Sang, Jiri Kosina, Sachin Kamat

On 14 February 2014 12:01, Sachin Kamat <sachin.kamat-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> wrote:
> Commit 436d42c61c3e ("ARM: samsung: move platform_data definitions")
> moved the files 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-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> ---
>  include/linux/platform_data/i2c-s3c2410.h |    9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/include/linux/platform_data/i2c-s3c2410.h b/include/linux/platform_data/i2c-s3c2410.h
> index 2a50048c1c44..05af66b840b9 100644
> --- a/include/linux/platform_data/i2c-s3c2410.h
> +++ b/include/linux/platform_data/i2c-s3c2410.h
> @@ -1,5 +1,4 @@
> -/* arch/arm/plat-s3c/include/plat/iic.h
> - *
> +/*
>   * Copyright 2004-2009 Simtec Electronics
>   *     Ben Dooks <ben-Y5A6D6n0/KfQXOPxS62xeg@public.gmane.org>
>   *
> @@ -10,8 +9,8 @@
>   * published by the Free Software Foundation.
>  */
>
> -#ifndef __ASM_ARCH_IIC_H
> -#define __ASM_ARCH_IIC_H __FILE__
> +#ifndef __I2C_S3C2410_H
> +#define __I2C_S3C2410_H __FILE__
>
>  #define S3C_IICFLG_FILTER      (1<<0)  /* enable s3c2440 filter */
>
> @@ -76,4 +75,4 @@ extern void s3c_i2c7_cfg_gpio(struct platform_device *dev);
>
>  extern struct s3c2410_platform_i2c default_i2c_data;
>
> -#endif /* __ASM_ARCH_IIC_H */
> +#endif /* __I2C_S3C2410_H */
> --
> 1.7.9.5
>

 Ping..

-- 
With warm regards,
Sachin

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

* Re: [PATCH 1/1] i2c: s3c2410: Trivial cleanup in header file
       [not found] ` <1392359490-9834-1-git-send-email-sachin.kamat-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
  2014-03-10 15:25   ` Sachin Kamat
@ 2014-03-10 16:33   ` Wolfram Sang
  1 sibling, 0 replies; 3+ messages in thread
From: Wolfram Sang @ 2014-03-10 16:33 UTC (permalink / raw)
  To: Sachin Kamat
  Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA, trivial-DgEjT+Ai2ygdnm+yROfE0A

[-- Attachment #1: Type: text/plain, Size: 453 bytes --]

On Fri, Feb 14, 2014 at 12:01:30PM +0530, Sachin Kamat wrote:
> Commit 436d42c61c3e ("ARM: samsung: move platform_data definitions")
> moved the files 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-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>

Applied to for-next, thanks!


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

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

end of thread, other threads:[~2014-03-10 16:33 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-14  6:31 [PATCH 1/1] i2c: s3c2410: Trivial cleanup in header file Sachin Kamat
     [not found] ` <1392359490-9834-1-git-send-email-sachin.kamat-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-03-10 15:25   ` Sachin Kamat
2014-03-10 16:33   ` Wolfram Sang

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.