diff for duplicates of <20120528112417.GF3923@besouro> diff --git a/a/1.txt b/N1/1.txt index fe41859..3b3d0e8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,34 +14,34 @@ On Mon, May 28, 2012 at 03:32:50PM +0530, Shilimkar, Santosh wrote: > >> > >> Signed-off-by: Eduardo Valentin<eduardo.valentin@ti.com> > >> --- -> >> arch/arm/mach-omap2/id.c | 16 +++++++++++++++- -> >> 1 files changed, 15 insertions(+), 1 deletions(-) +> >> ?arch/arm/mach-omap2/id.c | ? 16 +++++++++++++++- +> >> ?1 files changed, 15 insertions(+), 1 deletions(-) > >> > >> diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c > >> index 5bb9746..acfd698 100644 > >> --- a/arch/arm/mach-omap2/id.c > >> +++ b/arch/arm/mach-omap2/id.c > >> @@ -18,6 +18,7 @@ -> >> #include<linux/kernel.h> -> >> #include<linux/init.h> -> >> #include<linux/io.h> +> >> ?#include<linux/kernel.h> +> >> ?#include<linux/init.h> +> >> ?#include<linux/io.h> > >> +#include<linux/mfd/omap_control.h> > >> -> >> #include<asm/cputype.h> +> >> ?#include<asm/cputype.h> > >> > >> @@ -40,8 +41,14 @@ EXPORT_SYMBOL(omap_rev); > >> -> >> int omap_type(void) -> >> { -> >> + struct device *scm; -> >> + int ret = 0; -> >> u32 val = 0; +> >> ?int omap_type(void) +> >> ?{ +> >> + ? ? ? struct device *scm; +> >> + ? ? ? int ret = 0; +> >> ? ? ? ?u32 val = 0; > >> -> >> + scm = omap_control_get(); -> >> + if (IS_ERR_OR_NULL(scm)) -> >> + return 0; +> >> + ? ? ? scm = omap_control_get(); +> >> + ? ? ? if (IS_ERR_OR_NULL(scm)) +> >> + ? ? ? ? ? ? ? return 0; > >> + -> >> if (cpu_is_omap24xx()) { +> >> ? ? ? ?if (cpu_is_omap24xx()) { > > > > > > OK, not really related to that patch, but the previous cpu_is_omap24xx makes diff --git a/a/content_digest b/N1/content_digest index a4c3682..e7b911d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,18 +2,10 @@ "ref\01337934361-1606-7-git-send-email-eduardo.valentin@ti.com\0" "ref\04FBF80D5.2000600@ti.com\0" "ref\0CAMQu2gyjJdJZKAf+TJwQfQ2BgAXe_s-soTcs7Am6O4+yy=7cLQ@mail.gmail.com\0" - "From\0Eduardo Valentin <eduardo.valentin@ti.com>\0" - "Subject\0Re: [RFC PATCH 06/11] OMAP2+: use control module mfd driver in omap_type\0" + "From\0eduardo.valentin@ti.com (Eduardo Valentin)\0" + "Subject\0[RFC PATCH 06/11] OMAP2+: use control module mfd driver in omap_type\0" "Date\0Mon, 28 May 2012 14:24:17 +0300\0" - "To\0Shilimkar" - " Santosh <santosh.shilimkar@ti.com>\0" - "Cc\0amit.kucheria@linaro.org" - kbaidarov@dev.rtsoft.ru - kishon@ti.com - balbi@ti.com - linux-pm@lists.linux-foundation.org - 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" "Hello,\n" @@ -32,34 +24,34 @@ "> >>\n" "> >> Signed-off-by: Eduardo Valentin<eduardo.valentin@ti.com>\n" "> >> ---\n" - "> >> \302\240arch/arm/mach-omap2/id.c | \302\240 16 +++++++++++++++-\n" - "> >> \302\2401 files changed, 15 insertions(+), 1 deletions(-)\n" + "> >> ?arch/arm/mach-omap2/id.c | ? 16 +++++++++++++++-\n" + "> >> ?1 files changed, 15 insertions(+), 1 deletions(-)\n" "> >>\n" "> >> diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c\n" "> >> index 5bb9746..acfd698 100644\n" "> >> --- a/arch/arm/mach-omap2/id.c\n" "> >> +++ b/arch/arm/mach-omap2/id.c\n" "> >> @@ -18,6 +18,7 @@\n" - "> >> \302\240#include<linux/kernel.h>\n" - "> >> \302\240#include<linux/init.h>\n" - "> >> \302\240#include<linux/io.h>\n" + "> >> ?#include<linux/kernel.h>\n" + "> >> ?#include<linux/init.h>\n" + "> >> ?#include<linux/io.h>\n" "> >> +#include<linux/mfd/omap_control.h>\n" "> >>\n" - "> >> \302\240#include<asm/cputype.h>\n" + "> >> ?#include<asm/cputype.h>\n" "> >>\n" "> >> @@ -40,8 +41,14 @@ EXPORT_SYMBOL(omap_rev);\n" "> >>\n" - "> >> \302\240int omap_type(void)\n" - "> >> \302\240{\n" - "> >> + \302\240 \302\240 \302\240 struct device *scm;\n" - "> >> + \302\240 \302\240 \302\240 int ret = 0;\n" - "> >> \302\240 \302\240 \302\240 \302\240u32 val = 0;\n" + "> >> ?int omap_type(void)\n" + "> >> ?{\n" + "> >> + ? ? ? struct device *scm;\n" + "> >> + ? ? ? int ret = 0;\n" + "> >> ? ? ? ?u32 val = 0;\n" "> >>\n" - "> >> + \302\240 \302\240 \302\240 scm = omap_control_get();\n" - "> >> + \302\240 \302\240 \302\240 if (IS_ERR_OR_NULL(scm))\n" - "> >> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 return 0;\n" + "> >> + ? ? ? scm = omap_control_get();\n" + "> >> + ? ? ? if (IS_ERR_OR_NULL(scm))\n" + "> >> + ? ? ? ? ? ? ? return 0;\n" "> >> +\n" - "> >> \302\240 \302\240 \302\240 \302\240if (cpu_is_omap24xx()) {\n" + "> >> ? ? ? ?if (cpu_is_omap24xx()) {\n" "> >\n" "> >\n" "> > OK, not really related to that patch, but the previous cpu_is_omap24xx makes\n" @@ -86,4 +78,4 @@ "> Regards\n" > Santosh -5803b33781ec0670c9e53d27a2d6d9b31bf0e44ddcbc02a2cbf6e2970f14cfc5 +9846aa274bf025c25d92b9f59aa2cb8590e3b16f76cfa2b2ca719039a01ddf79
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.