| Message ID | 1388384533-20458-1-git-send-email-sachin.kamat@linaro.org |
|---|---|
| State | Accepted |
| Headers | show |
Hi Tomi, On 30 December 2013 11:52, Sachin Kamat <sachin.kamat@linaro.org> wrote: > Commit a3b2924547a7 ("ARM: ep93xx: 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/video-ep93xx.h | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) > > diff --git a/include/linux/platform_data/video-ep93xx.h b/include/linux/platform_data/video-ep93xx.h > index d5ae11d7c453..92fc2b2232e7 100644 > --- a/include/linux/platform_data/video-ep93xx.h > +++ b/include/linux/platform_data/video-ep93xx.h > @@ -1,9 +1,5 @@ > -/* > - * arch/arm/mach-ep93xx/include/mach/fb.h > - */ > - > -#ifndef __ASM_ARCH_EP93XXFB_H > -#define __ASM_ARCH_EP93XXFB_H > +#ifndef __VIDEO_EP93XX_H > +#define __VIDEO_EP93XX_H > > struct platform_device; > struct fb_videomode; > @@ -53,4 +49,4 @@ struct ep93xxfb_mach_info { > void (*blank)(int blank_mode, struct fb_info *info); > }; > > -#endif /* __ASM_ARCH_EP93XXFB_H */ > +#endif /* __VIDEO_EP93XX_H */ > -- > 1.7.9.5 > Gentle ping on this series..
On 8 January 2014 15:12, Tomi Valkeinen <tomi.valkeinen@ti.com> wrote: > On 2014-01-08 11:09, Sachin Kamat wrote: >> Hi Tomi, >> >> On 30 December 2013 11:52, Sachin Kamat <sachin.kamat@linaro.org> wrote: >>> Commit a3b2924547a7 ("ARM: ep93xx: 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> > > Thanks, queued the series for 3.14. Thanks Tomi.
diff --git a/include/linux/platform_data/video-ep93xx.h b/include/linux/platform_data/video-ep93xx.h index d5ae11d7c453..92fc2b2232e7 100644 --- a/include/linux/platform_data/video-ep93xx.h +++ b/include/linux/platform_data/video-ep93xx.h @@ -1,9 +1,5 @@ -/* - * arch/arm/mach-ep93xx/include/mach/fb.h - */ - -#ifndef __ASM_ARCH_EP93XXFB_H -#define __ASM_ARCH_EP93XXFB_H +#ifndef __VIDEO_EP93XX_H +#define __VIDEO_EP93XX_H struct platform_device; struct fb_videomode; @@ -53,4 +49,4 @@ struct ep93xxfb_mach_info { void (*blank)(int blank_mode, struct fb_info *info); }; -#endif /* __ASM_ARCH_EP93XXFB_H */ +#endif /* __VIDEO_EP93XX_H */
Commit a3b2924547a7 ("ARM: ep93xx: 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/video-ep93xx.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)