diff for duplicates of <20111003174844.GQ6324@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 1915814..82889fa 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -22,46 +22,46 @@ Acked-by: Tony Lindgren <tony@atomide.com> > > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > --- -> > 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 34c01a7..67bc6ce 100644 > > --- a/arch/arm/mach-omap2/smartreflex.c > > +++ b/arch/arm/mach-omap2/smartreflex.c > > @@ -1002,7 +1002,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", +> > ? ? ? ?}, > > diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c > > index c22217c..f7150ba 100644 > > --- a/arch/arm/plat-omap/dma.c > > +++ b/arch/arm/plat-omap/dma.c > > @@ -2105,7 +2105,7 @@ static int __devexit omap_system_dma_remove(struct platform_device *pdev) > > -> > static struct platform_driver omap_system_dma_driver = { -> > .probe = omap_system_dma_probe, -> > - .remove = omap_system_dma_remove, -> > + .remove = __devexit_p(omap_system_dma_remove), -> > .driver = { -> > .name = "omap_dma_system" -> > }, +> > ?static struct platform_driver omap_system_dma_driver = { +> > ? ? ? ?.probe ? ? ? ? ?= omap_system_dma_probe, +> > - ? ? ? .remove ? ? ? ? = omap_system_dma_remove, +> > + ? ? ? .remove ? ? ? ? = __devexit_p(omap_system_dma_remove), +> > ? ? ? ?.driver ? ? ? ? = { +> > ? ? ? ? ? ? ? ?.name ? = "omap_dma_system" +> > ? ? ? ?}, > > -- > > 1.7.5.4 > > > > -- > > 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 +> > the body of a message to majordomo at vger.kernel.org +> > More majordomo info at ?http://vger.kernel.org/majordomo-info.html > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in -> the body of a message to majordomo@vger.kernel.org +> the body of a message to majordomo at vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ diff --git a/a/content_digest b/N1/content_digest index b686da9..024d80c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,10 @@ "ref\01317566760-25681-1-git-send-email-arnd@arndb.de\0" "ref\01317566760-25681-5-git-send-email-arnd@arndb.de\0" "ref\0CAFULf_wevZxWW1RW+r-18R_8=ry2kD6_i5L9NfPd9t8afm5Cog@mail.gmail.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH 04/30] ARM: omap: add missing __devexit_p() annotations\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH 04/30] ARM: omap: add missing __devexit_p() annotations\0" "Date\0Mon, 3 Oct 2011 10:48:48 -0700\0" - "To\0Bjarne Steinsbo <bsteinsbo@gmail.com>\0" - "Cc\0Arnd Bergmann <arnd@arndb.de>" - linux-omap@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " linux-kernel@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "* Bjarne Steinsbo <bsteinsbo@gmail.com> [111002 08:22]:\n" @@ -35,48 +31,48 @@ "> >\n" "> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>\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 34c01a7..67bc6ce 100644\n" "> > --- a/arch/arm/mach-omap2/smartreflex.c\n" "> > +++ b/arch/arm/mach-omap2/smartreflex.c\n" "> > @@ -1002,7 +1002,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" "> > diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c\n" "> > index c22217c..f7150ba 100644\n" "> > --- a/arch/arm/plat-omap/dma.c\n" "> > +++ b/arch/arm/plat-omap/dma.c\n" "> > @@ -2105,7 +2105,7 @@ static int __devexit omap_system_dma_remove(struct platform_device *pdev)\n" "> >\n" - "> > \302\240static struct platform_driver omap_system_dma_driver = {\n" - "> > \302\240 \302\240 \302\240 \302\240.probe \302\240 \302\240 \302\240 \302\240 \302\240= omap_system_dma_probe,\n" - "> > - \302\240 \302\240 \302\240 .remove \302\240 \302\240 \302\240 \302\240 = omap_system_dma_remove,\n" - "> > + \302\240 \302\240 \302\240 .remove \302\240 \302\240 \302\240 \302\240 = __devexit_p(omap_system_dma_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 = \"omap_dma_system\"\n" - "> > \302\240 \302\240 \302\240 \302\240},\n" + "> > ?static struct platform_driver omap_system_dma_driver = {\n" + "> > ? ? ? ?.probe ? ? ? ? ?= omap_system_dma_probe,\n" + "> > - ? ? ? .remove ? ? ? ? = omap_system_dma_remove,\n" + "> > + ? ? ? .remove ? ? ? ? = __devexit_p(omap_system_dma_remove),\n" + "> > ? ? ? ?.driver ? ? ? ? = {\n" + "> > ? ? ? ? ? ? ? ?.name ? = \"omap_dma_system\"\n" + "> > ? ? ? ?},\n" "> > --\n" "> > 1.7.5.4\n" "> >\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 \302\240http://vger.kernel.org/majordomo-info.html\n" + "> > the body of a message to majordomo at vger.kernel.org\n" + "> > More majordomo info at ?http://vger.kernel.org/majordomo-info.html\n" "> >\n" "> --\n" "> To unsubscribe from this list: send the line \"unsubscribe linux-kernel\" in\n" - "> the body of a message to majordomo@vger.kernel.org\n" + "> the body of a message to majordomo at vger.kernel.org\n" "> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" > Please read the FAQ at http://www.tux.org/lkml/ -9e556f505e8b0434d05a759a0f2c3ceb61a17dd558c01f630d1ca96f7b36edfb +0d514a3e29479aba453b024436a788b27783098982628acda0a568188769810c
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.