| Message ID | 1388038289-8953-1-git-send-email-sachin.kamat@linaro.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Thursday, December 26, 2013 3:11 PM, Sachin Kamat wrote: > > commit 5d229ce569be ("ASoC: samsung: move plat/ headers to local directory") > moved the header files but forgot to clean the pointers to their old locaton. > Remove them now. > > Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> It looks good. Reviewed-by: Jingoo Han <jg1.han@samsung.com> Best regards, Jingoo Han > --- > sound/soc/samsung/regs-ac97.h | 9 ++++----- > sound/soc/samsung/regs-iis.h | 9 ++++----- > 2 files changed, 8 insertions(+), 10 deletions(-) > > diff --git a/sound/soc/samsung/regs-ac97.h b/sound/soc/samsung/regs-ac97.h > index c3878f7acb83..a71be45bbffc 100644 > --- a/sound/soc/samsung/regs-ac97.h > +++ b/sound/soc/samsung/regs-ac97.h > @@ -1,5 +1,4 @@ > -/* arch/arm/mach-s3c2410/include/mach/regs-ac97.h > - * > +/* > * Copyright (c) 2006 Simtec Electronics <linux@simtec.co.uk> > * http://www.simtec.co.uk/products/SWLINUX/ > * > @@ -10,8 +9,8 @@ > * S3C2440 AC97 Controller > */ > > -#ifndef __ASM_ARCH_REGS_AC97_H > -#define __ASM_ARCH_REGS_AC97_H __FILE__ > +#ifndef __SAMSUNG_REGS_AC97_H__ > +#define __SAMSUNG_REGS_AC97_H__ > > #define S3C_AC97_GLBCTRL (0x00) > > @@ -64,4 +63,4 @@ > #define S3C_AC97_PCM_DATA (0x18) > #define S3C_AC97_MIC_DATA (0x1C) > > -#endif /* __ASM_ARCH_REGS_AC97_H */ > +#endif /* __SAMSUNG_REGS_AC97_H__ */ > diff --git a/sound/soc/samsung/regs-iis.h b/sound/soc/samsung/regs-iis.h > index a18d35e7a735..dc6cbbe9c4f0 100644 > --- a/sound/soc/samsung/regs-iis.h > +++ b/sound/soc/samsung/regs-iis.h > @@ -1,5 +1,4 @@ > -/* arch/arm/plat-samsung/include/plat/regs-iis.h > - * > +/* > * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk> > * http://www.simtec.co.uk/products/SWLINUX/ > * > @@ -10,8 +9,8 @@ > * S3C2410 IIS register definition > */ > > -#ifndef __ASM_ARCH_REGS_IIS_H > -#define __ASM_ARCH_REGS_IIS_H > +#ifndef __SAMSUNG_REGS_IIS_H__ > +#define __SAMSUNG_REGS_IIS_H__ > > #define S3C2410_IISCON (0x00) > > @@ -67,4 +66,4 @@ > > #define S3C2410_IISFIFO (0x10) > > -#endif /* __ASM_ARCH_REGS_IIS_H */ > +#endif /* __SAMSUNG_REGS_IIS_H__ */ > -- > 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Dec 26, 2013 at 11:41:29AM +0530, Sachin Kamat wrote: > commit 5d229ce569be ("ASoC: samsung: move plat/ headers to local directory") > moved the header files but forgot to clean the pointers to their old locaton. > Remove them now. Applied, thanks.
diff --git a/sound/soc/samsung/regs-ac97.h b/sound/soc/samsung/regs-ac97.h index c3878f7acb83..a71be45bbffc 100644 --- a/sound/soc/samsung/regs-ac97.h +++ b/sound/soc/samsung/regs-ac97.h @@ -1,5 +1,4 @@ -/* arch/arm/mach-s3c2410/include/mach/regs-ac97.h - * +/* * Copyright (c) 2006 Simtec Electronics <linux@simtec.co.uk> * http://www.simtec.co.uk/products/SWLINUX/ * @@ -10,8 +9,8 @@ * S3C2440 AC97 Controller */ -#ifndef __ASM_ARCH_REGS_AC97_H -#define __ASM_ARCH_REGS_AC97_H __FILE__ +#ifndef __SAMSUNG_REGS_AC97_H__ +#define __SAMSUNG_REGS_AC97_H__ #define S3C_AC97_GLBCTRL (0x00) @@ -64,4 +63,4 @@ #define S3C_AC97_PCM_DATA (0x18) #define S3C_AC97_MIC_DATA (0x1C) -#endif /* __ASM_ARCH_REGS_AC97_H */ +#endif /* __SAMSUNG_REGS_AC97_H__ */ diff --git a/sound/soc/samsung/regs-iis.h b/sound/soc/samsung/regs-iis.h index a18d35e7a735..dc6cbbe9c4f0 100644 --- a/sound/soc/samsung/regs-iis.h +++ b/sound/soc/samsung/regs-iis.h @@ -1,5 +1,4 @@ -/* arch/arm/plat-samsung/include/plat/regs-iis.h - * +/* * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk> * http://www.simtec.co.uk/products/SWLINUX/ * @@ -10,8 +9,8 @@ * S3C2410 IIS register definition */ -#ifndef __ASM_ARCH_REGS_IIS_H -#define __ASM_ARCH_REGS_IIS_H +#ifndef __SAMSUNG_REGS_IIS_H__ +#define __SAMSUNG_REGS_IIS_H__ #define S3C2410_IISCON (0x00) @@ -67,4 +66,4 @@ #define S3C2410_IISFIFO (0x10) -#endif /* __ASM_ARCH_REGS_IIS_H */ +#endif /* __SAMSUNG_REGS_IIS_H__ */
commit 5d229ce569be ("ASoC: samsung: move plat/ headers to local directory") moved the header files but forgot to clean the pointers to their old locaton. Remove them now. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> --- sound/soc/samsung/regs-ac97.h | 9 ++++----- sound/soc/samsung/regs-iis.h | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-)