diff for duplicates of <20120509160042.GM5088@atomide.com> diff --git a/a/1.txt b/N1/1.txt index a118b40..a880692 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,20 +2,20 @@ > Tony, > > [snip] -> >> >> -#if defined(CONFIG_ARCH_OMAP4) && !(defined(CONFIG_ARCH_OMAP2) || \ -> >> >> - defined(CONFIG_ARCH_OMAP3)) +> >> >> -#if defined(CONFIG_ARCH_OMAP4) && !(defined(CONFIG_ARCH_OMAP2) || ? ?\ +> >> >> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? defined(CONFIG_ARCH_OMAP3)) > >> >> +#if (defined(CONFIG_ARCH_OMAP5) || defined(CONFIG_ARCH_OMAP4)) && \ -> >> >> + !(defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)) +> >> >> + ? ? ? ? ? ? !(defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)) > >> >> + -> >> >> static inline u32 omap2_prm_read_mod_reg(s16 module, u16 idx) -> >> >> { -> >> >> WARN(1, "prm: omap2xxx/omap3xxx specific function and " +> >> >> ?static inline u32 omap2_prm_read_mod_reg(s16 module, u16 idx) +> >> >> ?{ +> >> >> ? ? ? WARN(1, "prm: omap2xxx/omap3xxx specific function and " > >> > > >> > Maybe these functions could be just set up as __weak to avoid the > >> > ifdeffery? > >> > -> >> sorry to understand, -> >> you mean make this weak and have a strong override for OMAP2 ? +> >> ?sorry to understand, +> >> ?you mean make this weak and have a strong override for OMAP2 ? > > > > Yeah that should do the trick, right? > Ok, There are multiple functions under that #ifdef. @@ -43,7 +43,3 @@ CONFIG_SOC_HAS_OMAPXYZ_BLAH rather than CONFIG_SOC_OMAP4PLUS. Regards, Tony --- -To unsubscribe from this list: send the line "unsubscribe linux-omap" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 16ac40a..b082e06 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,35 +4,30 @@ "ref\0CAJ7qFSfkHGF7ehanZP=hyZ27HqSp1ONsT0tUV-wpLne9B4DEaQ@mail.gmail.com\0" "ref\020120507173351.GB5088@atomide.com\0" "ref\0CAJ7qFSeziNRTUsUWc2Owjqs=A99p_WgiVH8vnEBoVB42v2p+pQ@mail.gmail.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH 02/13] ARM: OMAP5: Add minimal support for OMAP5430 SOC\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH 02/13] ARM: OMAP5: Add minimal support for OMAP5430 SOC\0" "Date\0Wed, 9 May 2012 09:00:42 -0700\0" - "To\0R" - " Sricharan <r.sricharan@ti.com>\0" - "Cc\0linux-omap@vger.kernel.org" - linux-arm-kernel@lists.infradead.org - santosh.shilimkar@ti.com - " b-cousson@ti.com\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "* R, Sricharan <r.sricharan@ti.com> [120509 02:09]:\n" "> Tony,\n" "> \n" "> [snip]\n" - "> >> >> -#if defined(CONFIG_ARCH_OMAP4) && !(defined(CONFIG_ARCH_OMAP2) || \302\240 \302\240\\\n" - "> >> >> - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 defined(CONFIG_ARCH_OMAP3))\n" + "> >> >> -#if defined(CONFIG_ARCH_OMAP4) && !(defined(CONFIG_ARCH_OMAP2) || ? ?\\\n" + "> >> >> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? defined(CONFIG_ARCH_OMAP3))\n" "> >> >> +#if (defined(CONFIG_ARCH_OMAP5) || defined(CONFIG_ARCH_OMAP4)) && \\\n" - "> >> >> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 !(defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3))\n" + "> >> >> + ? ? ? ? ? ? !(defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3))\n" "> >> >> +\n" - "> >> >> \302\240static inline u32 omap2_prm_read_mod_reg(s16 module, u16 idx)\n" - "> >> >> \302\240{\n" - "> >> >> \302\240 \302\240 \302\240 WARN(1, \"prm: omap2xxx/omap3xxx specific function and \"\n" + "> >> >> ?static inline u32 omap2_prm_read_mod_reg(s16 module, u16 idx)\n" + "> >> >> ?{\n" + "> >> >> ? ? ? WARN(1, \"prm: omap2xxx/omap3xxx specific function and \"\n" "> >> >\n" "> >> > Maybe these functions could be just set up as __weak to avoid the\n" "> >> > ifdeffery?\n" "> >> >\n" - "> >> \302\240sorry to understand,\n" - "> >> \302\240you mean make this weak and have a strong override for OMAP2 ?\n" + "> >> ?sorry to understand,\n" + "> >> ?you mean make this weak and have a strong override for OMAP2 ?\n" "> >\n" "> > Yeah that should do the trick, right?\n" "> Ok, There are multiple functions under that #ifdef.\n" @@ -59,10 +54,6 @@ "\n" "Regards,\n" "\n" - "Tony\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-omap\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + Tony -6917616ee09fe8f24b27b4c7b06a0a2250bb56a6fa4f80e2df23eeac582eb506 +77b433e3910d9743352e4a1881d28ccd8df111a93116f36f64fdf7aec72dfb6a
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.