diff for duplicates of <20120629210752.GA13859@kroah.com> diff --git a/a/1.txt b/N1/1.txt index dd2217c..ab52ddd 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,35 +7,35 @@ On Fri, Jun 29, 2012 at 07:16:19PM +0530, Shilimkar, Santosh wrote: > > On Tue, Jun 26, 2012 at 10:56 AM, Rajendra Nayak <rnayak@ti.com> wrote: > > > On Tuesday 26 June 2012 10:53 AM, Shilimkar, Santosh wrote: > > >> -> > >> On Tue, Jun 26, 2012 at 10:49 AM, Rajendra Nayak<rnayak@ti.com> wrote: +> > >> On Tue, Jun 26, 2012 at 10:49 AM, Rajendra Nayak<rnayak@ti.com> ?wrote: > > >>> > > >>> On Tuesday 26 June 2012 10:39 AM, Shilimkar, Santosh wrote: > > >>>>>> > > >>>>>> > > >>>>>> +#if defined(CONFIG_OF) > > >>>>>>> -> > >>>>>>> > +static const struct of_device_id emif_of_match[] = { -> > >>>>>>> > + { .compatible = "ti,emif-4d" }, -> > >>>>>>> > + { .compatible = "ti,emif-4d5" }, -> > >>>>>>> > + {}, -> > >>>>>>> > +}; -> > >>>>>>> > +MODULE_DEVICE_TABLE(of, emif_of_match); -> > >>>>>>> > +#endif -> > >>>>>>> > + -> > >>>>>>> > static struct platform_driver emif_driver = { -> > >>>>>>> > .remove = __exit_p(emif_remove), -> > >>>>>>> > .shutdown = emif_shutdown, -> > >>>>>>> > .driver = { -> > >>>>>>> > .name = "emif", -> > >>>>>>> > +#if defined(CONFIG_OF) -> > >>>>>>> > + .of_match_table = of_match_ptr(emif_of_match), -> > >>>>>>> > +#endif +> > >>>>>>> ?> ? ?+static const struct of_device_id emif_of_match[] = { +> > >>>>>>> ?> ? ?+ ? ? ? ? ? ? { .compatible = "ti,emif-4d" }, +> > >>>>>>> ?> ? ?+ ? ? ? ? ? ? { .compatible = "ti,emif-4d5" }, +> > >>>>>>> ?> ? ?+ ? ? ? ? ? ? {}, +> > >>>>>>> ?> ? ?+}; +> > >>>>>>> ?> ? ?+MODULE_DEVICE_TABLE(of, emif_of_match); +> > >>>>>>> ?> ? ?+#endif +> > >>>>>>> ?> ? ?+ +> > >>>>>>> ?> ? ? ?static struct platform_driver emif_driver = { +> > >>>>>>> ?> ? ? ? ? ? .remove ? ? ? ? = __exit_p(emif_remove), +> > >>>>>>> ?> ? ? ? ? ? .shutdown ? ? ? = emif_shutdown, +> > >>>>>>> ?> ? ? ? ? ? .driver = { +> > >>>>>>> ?> ? ? ? ? ? ? ? ? ? .name = "emif", +> > >>>>>>> ?> ? ?+#if defined(CONFIG_OF) +> > >>>>>>> ?> ? ?+ ? ? ? ? ? ? .of_match_table = of_match_ptr(emif_of_match), +> > >>>>>>> ?> ? ?+#endif > > >>>>> > > >>>>> > > >>>>>> -> > >>>>>> Are these two still #if defined needed? +> > >>>>>> ?Are these two still #if defined needed? > > >>>>>> -> > >>>>>> Also, what about the IS_DEFINED macro? +> > >>>>>> ?Also, what about the IS_DEFINED macro? > > >>>>>> > > >>>> > > >>>> Yes. To avoid the build break in !DT build. @@ -62,7 +62,3 @@ On Fri, Jun 29, 2012 at 07:16:19PM +0530, Shilimkar, Santosh wrote: > With your ack, I will ask Tony to pull this series for 3.6. Sent them where? I didn't see a copy here :( --- -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 4bccf28..dd580d0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -8,15 +8,10 @@ "ref\04FE947F7.9030000@ti.com\0" "ref\0CAMQu2gwzFV-79CuEAmOHCZ7XivXrALjXkoB+J-QpgJkZ_PoRVg@mail.gmail.com\0" "ref\0CAMQu2gx2RT0iyo+LD1TyTJg9FRSUD8SK2tA=nxAoULzQOa6L7A@mail.gmail.com\0" - "From\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>\0" - "Subject\0Re: [PATCH v3 4/4] memory: emif: add device tree support to emif driver\0" + "From\0gregkh@linuxfoundation.org (Greg Kroah-Hartman)\0" + "Subject\0[PATCH v3 4/4] memory: emif: add device tree support to emif driver\0" "Date\0Fri, 29 Jun 2012 17:07:52 -0400\0" - "To\0Shilimkar" - " Santosh <santosh.shilimkar@ti.com>\0" - "Cc\0tony@atomide.com" - linux-arm-kernel@lists.infradead.org - linux-omap@vger.kernel.org - " Aneesh V <aneesh@ti.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Fri, Jun 29, 2012 at 07:16:19PM +0530, Shilimkar, Santosh wrote:\n" @@ -28,35 +23,35 @@ "> > On Tue, Jun 26, 2012 at 10:56 AM, Rajendra Nayak <rnayak@ti.com> wrote:\n" "> > > On Tuesday 26 June 2012 10:53 AM, Shilimkar, Santosh wrote:\n" "> > >>\n" - "> > >> On Tue, Jun 26, 2012 at 10:49 AM, Rajendra Nayak<rnayak@ti.com> \302\240wrote:\n" + "> > >> On Tue, Jun 26, 2012 at 10:49 AM, Rajendra Nayak<rnayak@ti.com> ?wrote:\n" "> > >>>\n" "> > >>> On Tuesday 26 June 2012 10:39 AM, Shilimkar, Santosh wrote:\n" "> > >>>>>>\n" "> > >>>>>>\n" "> > >>>>>> +#if defined(CONFIG_OF)\n" "> > >>>>>>>\n" - "> > >>>>>>> \302\240> \302\240 \302\240+static const struct of_device_id emif_of_match[] = {\n" - "> > >>>>>>> \302\240> \302\240 \302\240+ \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 { .compatible = \"ti,emif-4d\" },\n" - "> > >>>>>>> \302\240> \302\240 \302\240+ \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 { .compatible = \"ti,emif-4d5\" },\n" - "> > >>>>>>> \302\240> \302\240 \302\240+ \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 {},\n" - "> > >>>>>>> \302\240> \302\240 \302\240+};\n" - "> > >>>>>>> \302\240> \302\240 \302\240+MODULE_DEVICE_TABLE(of, emif_of_match);\n" - "> > >>>>>>> \302\240> \302\240 \302\240+#endif\n" - "> > >>>>>>> \302\240> \302\240 \302\240+\n" - "> > >>>>>>> \302\240> \302\240 \302\240 \302\240static struct platform_driver emif_driver = {\n" - "> > >>>>>>> \302\240> \302\240 \302\240 \302\240 \302\240 \302\240 .remove \302\240 \302\240 \302\240 \302\240 = __exit_p(emif_remove),\n" - "> > >>>>>>> \302\240> \302\240 \302\240 \302\240 \302\240 \302\240 .shutdown \302\240 \302\240 \302\240 = emif_shutdown,\n" - "> > >>>>>>> \302\240> \302\240 \302\240 \302\240 \302\240 \302\240 .driver = {\n" - "> > >>>>>>> \302\240> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 .name = \"emif\",\n" - "> > >>>>>>> \302\240> \302\240 \302\240+#if defined(CONFIG_OF)\n" - "> > >>>>>>> \302\240> \302\240 \302\240+ \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 .of_match_table = of_match_ptr(emif_of_match),\n" - "> > >>>>>>> \302\240> \302\240 \302\240+#endif\n" + "> > >>>>>>> ?> ? ?+static const struct of_device_id emif_of_match[] = {\n" + "> > >>>>>>> ?> ? ?+ ? ? ? ? ? ? { .compatible = \"ti,emif-4d\" },\n" + "> > >>>>>>> ?> ? ?+ ? ? ? ? ? ? { .compatible = \"ti,emif-4d5\" },\n" + "> > >>>>>>> ?> ? ?+ ? ? ? ? ? ? {},\n" + "> > >>>>>>> ?> ? ?+};\n" + "> > >>>>>>> ?> ? ?+MODULE_DEVICE_TABLE(of, emif_of_match);\n" + "> > >>>>>>> ?> ? ?+#endif\n" + "> > >>>>>>> ?> ? ?+\n" + "> > >>>>>>> ?> ? ? ?static struct platform_driver emif_driver = {\n" + "> > >>>>>>> ?> ? ? ? ? ? .remove ? ? ? ? = __exit_p(emif_remove),\n" + "> > >>>>>>> ?> ? ? ? ? ? .shutdown ? ? ? = emif_shutdown,\n" + "> > >>>>>>> ?> ? ? ? ? ? .driver = {\n" + "> > >>>>>>> ?> ? ? ? ? ? ? ? ? ? .name = \"emif\",\n" + "> > >>>>>>> ?> ? ?+#if defined(CONFIG_OF)\n" + "> > >>>>>>> ?> ? ?+ ? ? ? ? ? ? .of_match_table = of_match_ptr(emif_of_match),\n" + "> > >>>>>>> ?> ? ?+#endif\n" "> > >>>>>\n" "> > >>>>>\n" "> > >>>>>>\n" - "> > >>>>>> \302\240Are these two still #if defined needed?\n" + "> > >>>>>> ?Are these two still #if defined needed?\n" "> > >>>>>>\n" - "> > >>>>>> \302\240Also, what about the IS_DEFINED macro?\n" + "> > >>>>>> ?Also, what about the IS_DEFINED macro?\n" "> > >>>>>>\n" "> > >>>>\n" "> > >>>> Yes. To avoid the build break in !DT build.\n" @@ -82,10 +77,6 @@ "> Posted the entire series again with updated $subject patch.\n" "> With your ack, I will ask Tony to pull this series for 3.6.\n" "\n" - "Sent them where? I didn't see a copy here :(\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 + Sent them where? I didn't see a copy here :( -138248240ea7e222d86ac522750b7fb61ef1db9861de5af71847945635fe2944 +02544489a924b3d48fb12f3216def8052b541fae73c0ea9d3c9261ef5781be99
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.