diff for duplicates of <20120315165932.GY12083@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 1941234..7ae153d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,23 +16,23 @@ > > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> > > Acked-by: Tony Lindgren <tony@atomide.com> > > --- -> > arch/arm/mach-omap2/smartreflex.c | 2 +- -> > arch/arm/plat-omap/dma.c | 2 +- -> > 2 files changed, 2 insertions(+), 2 deletions(-) +> > ?arch/arm/mach-omap2/smartreflex.c | ? ?2 +- +> > ?arch/arm/plat-omap/dma.c ? ? ? ? ?| ? ?2 +- +> > ?2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c > > index 7e755bb..47c77a1 100644 > > --- a/arch/arm/mach-omap2/smartreflex.c > > +++ b/arch/arm/mach-omap2/smartreflex.c > > @@ -1012,7 +1012,7 @@ static int __devexit omap_sr_remove(struct platform_device *pdev) -> > } +> > ?} > > -> > static struct platform_driver smartreflex_driver = { -> > - .remove = omap_sr_remove, -> > + .remove = __devexit_p(omap_sr_remove), -> > .driver = { -> > .name = "smartreflex", -> > }, +> > ?static struct platform_driver smartreflex_driver = { +> > - ? ? ? .remove ? ? ? ? = omap_sr_remove, +> > + ? ? ? .remove ? ? ? ? = __devexit_p(omap_sr_remove), +> > ? ? ? ?.driver ? ? ? ? = { +> > ? ? ? ? ? ? ? ?.name ? = "smartreflex", +> > ? ? ? ?}, > Tony already has this change in his master branch, commit > 149f1d5c8d2fd6879cdf93ca70f1cb745e698a1e ('ARM: OMAP2+: Fix devexit > for smartreflex when CONFIG_HOTPLUG is not set'). @@ -42,7 +42,3 @@ Also same commit in arm-soc/for-next. 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 0349eef..c16c4ea 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,10 @@ "ref\020120315102845.GB16389@n2100.arm.linux.org.uk\0" "ref\0E1S87wp-0000Mz-V8@rmk-PC.arm.linux.org.uk\0" "ref\0CAORVsuUVC4hpotK=eybA=Eqtfg0+PivjwRUENjCwcLG2dp1Ucg@mail.gmail.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH 4/6] ARM: OMAP: fix missing __devexit_p() annotations\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH 4/6] ARM: OMAP: fix missing __devexit_p() annotations\0" "Date\0Thu, 15 Mar 2012 09:59:33 -0700\0" - "To\0Jean Pihet <jean.pihet@newoldbits.com>\0" - "Cc\0Russell King <rmk+kernel@arm.linux.org.uk>" - linux-omap@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "* Jean Pihet <jean.pihet@newoldbits.com> [120315 04:09]:\n" @@ -28,23 +25,23 @@ "> > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>\n" "> > Acked-by: Tony Lindgren <tony@atomide.com>\n" "> > ---\n" - "> > \302\240arch/arm/mach-omap2/smartreflex.c | \302\240 \302\2402 +-\n" - "> > \302\240arch/arm/plat-omap/dma.c \302\240 \302\240 \302\240 \302\240 \302\240| \302\240 \302\2402 +-\n" - "> > \302\2402 files changed, 2 insertions(+), 2 deletions(-)\n" + "> > ?arch/arm/mach-omap2/smartreflex.c | ? ?2 +-\n" + "> > ?arch/arm/plat-omap/dma.c ? ? ? ? ?| ? ?2 +-\n" + "> > ?2 files changed, 2 insertions(+), 2 deletions(-)\n" "> >\n" "> > diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c\n" "> > index 7e755bb..47c77a1 100644\n" "> > --- a/arch/arm/mach-omap2/smartreflex.c\n" "> > +++ b/arch/arm/mach-omap2/smartreflex.c\n" "> > @@ -1012,7 +1012,7 @@ static int __devexit omap_sr_remove(struct platform_device *pdev)\n" - "> > \302\240}\n" + "> > ?}\n" "> >\n" - "> > \302\240static struct platform_driver smartreflex_driver = {\n" - "> > - \302\240 \302\240 \302\240 .remove \302\240 \302\240 \302\240 \302\240 = omap_sr_remove,\n" - "> > + \302\240 \302\240 \302\240 .remove \302\240 \302\240 \302\240 \302\240 = __devexit_p(omap_sr_remove),\n" - "> > \302\240 \302\240 \302\240 \302\240.driver \302\240 \302\240 \302\240 \302\240 = {\n" - "> > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240.name \302\240 = \"smartreflex\",\n" - "> > \302\240 \302\240 \302\240 \302\240},\n" + "> > ?static struct platform_driver smartreflex_driver = {\n" + "> > - ? ? ? .remove ? ? ? ? = omap_sr_remove,\n" + "> > + ? ? ? .remove ? ? ? ? = __devexit_p(omap_sr_remove),\n" + "> > ? ? ? ?.driver ? ? ? ? = {\n" + "> > ? ? ? ? ? ? ? ?.name ? = \"smartreflex\",\n" + "> > ? ? ? ?},\n" "> Tony already has this change in his master branch, commit\n" "> 149f1d5c8d2fd6879cdf93ca70f1cb745e698a1e ('ARM: OMAP2+: Fix devexit\n" "> for smartreflex when CONFIG_HOTPLUG is not set').\n" @@ -53,10 +50,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 -27a12d7c2adcdfbb3e9c4125f53b361dce9ace967045f306c1848844f02b2ba7 +eff3b30245531685735ec3271f8066b5aba98c5b4503ef3872d3d0f3bc7fa906
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.