* Arnd Bergmann <a...@arndb.de> [130214 14:51]: > Commit e4c060db "ARM: OMAP: Split plat/cpu.h into local soc.h for > mach-omap1 and mach-omap2" moved the bulk of "plat/cpu.h" into "cpu.h" > but did not add an include guard for the new file that was present > in the old one. There are cases where the file is indeed included > multiple times, probably by accident, but adding the include > guard ensures that this has no further consequences. > > Without this patch, building allmodconfig results in lots of warnings like: > > In file included from arch/arm/mach-omap2/drm.c:31:0: > arch/arm/mach-omap2/soc.h:206:0: warning: "cpu_is_omap24xx" redefined > [enabled by default] > In file included from arch/arm/mach-omap2/drm.c:28:0: > arch/arm/mach-omap2/soc.h:227:0: note: this is the location of the previous > definition > In file included from arch/arm/mach-omap2/drm.c:31:0: > arch/arm/mach-omap2/soc.h:207:0: warning: "cpu_is_omap242x" redefined > [enabled by default]
I left it out intentionally as these are private to mach-omap2, and I'd like to simplify the indirect includes there further. So I'd rather just remove the duplicate soc.h from drm.c. If people really think this should be applied, I have no objections to this patch naturally. Regards, Tony > Signed-off-by: Arnd Bergmann <a...@arndb.de> > Cc: Tony Lindgren <t...@atomide.com> > --- > arch/arm/mach-omap2/soc.h | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h > index c62116b..97dd373 100644 > --- a/arch/arm/mach-omap2/soc.h > +++ b/arch/arm/mach-omap2/soc.h > @@ -24,6 +24,8 @@ > * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > * > */ > +#ifndef OMAP2_SOC_H > +#define OMAP2_SOC_H > > #include "omap24xx.h" > #include "omap34xx.h" > @@ -497,3 +499,4 @@ level(__##fn); > > #endif /* __ASSEMBLY__ */ > > +#endif > -- > 1.8.1.2 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
