| Message ID | 1388380592-3420-1-git-send-email-sachin.kamat@linaro.org |
|---|---|
| State | Accepted |
| Headers | show |
On 30 December 2013 10:46, Sachin Kamat <sachin.kamat@linaro.org> wrote: > Commit 293b2da1b611 ("ARM: pxa: 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/dma-mmp_tdma.h | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/include/linux/platform_data/dma-mmp_tdma.h b/include/linux/platform_data/dma-mmp_tdma.h > index 239e0fc1bb1f..66574ea39f97 100644 > --- a/include/linux/platform_data/dma-mmp_tdma.h > +++ b/include/linux/platform_data/dma-mmp_tdma.h > @@ -1,6 +1,4 @@ > /* > - * linux/arch/arm/mach-mmp/include/mach/sram.h > - * > * SRAM Memory Management > * > * Copyright (c) 2011 Marvell Semiconductors Inc. > @@ -11,8 +9,8 @@ > * > */ > > -#ifndef __ASM_ARCH_SRAM_H > -#define __ASM_ARCH_SRAM_H > +#ifndef __DMA_MMP_TDMA_H > +#define __DMA_MMP_TDMA_H > > #include <linux/genalloc.h> > > @@ -32,4 +30,4 @@ struct sram_platdata { > > extern struct gen_pool *sram_get_gpool(char *pool_name); > > -#endif /* __ASM_ARCH_SRAM_H */ > +#endif /* __DMA_MMP_TDMA_H */ > -- > 1.7.9.5 > Gentle ping..
diff --git a/include/linux/platform_data/dma-mmp_tdma.h b/include/linux/platform_data/dma-mmp_tdma.h index 239e0fc1bb1f..66574ea39f97 100644 --- a/include/linux/platform_data/dma-mmp_tdma.h +++ b/include/linux/platform_data/dma-mmp_tdma.h @@ -1,6 +1,4 @@ /* - * linux/arch/arm/mach-mmp/include/mach/sram.h - * * SRAM Memory Management * * Copyright (c) 2011 Marvell Semiconductors Inc. @@ -11,8 +9,8 @@ * */ -#ifndef __ASM_ARCH_SRAM_H -#define __ASM_ARCH_SRAM_H +#ifndef __DMA_MMP_TDMA_H +#define __DMA_MMP_TDMA_H #include <linux/genalloc.h> @@ -32,4 +30,4 @@ struct sram_platdata { extern struct gen_pool *sram_get_gpool(char *pool_name); -#endif /* __ASM_ARCH_SRAM_H */ +#endif /* __DMA_MMP_TDMA_H */
Commit 293b2da1b611 ("ARM: pxa: 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/dma-mmp_tdma.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)