diff for duplicates of <87txzvc2sm.fsf@ti.com> diff --git a/a/1.txt b/N1/1.txt index ab8e21e..9d00ddb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,9 +12,9 @@ >>> >>> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> >>> --- ->>> arch/arm/mach-omap2/dma.c | 2 +- ->>> arch/arm/plat-omap/dma.c | 4 ++-- ->>> 2 files changed, 3 insertions(+), 3 deletions(-) +>>> ?arch/arm/mach-omap2/dma.c | ? ?2 +- +>>> ?arch/arm/plat-omap/dma.c ?| ? ?4 ++-- +>>> ?2 files changed, 3 insertions(+), 3 deletions(-) >>> >>> diff --git a/arch/arm/mach-omap2/dma.c b/arch/arm/mach-omap2/dma.c >>> index b19d849..2750bb9 100644 @@ -22,10 +22,10 @@ >>> +++ b/arch/arm/mach-omap2/dma.c >>> @@ -227,7 +227,7 @@ static int __init omap2_system_dma_init_dev(struct omap_hwmod *oh, void *unused) >>> ->>> dma_stride = OMAP2_DMA_STRIDE; ->>> dma_common_ch_start = CSDP; ->>> - if (cpu_is_omap3630() || cpu_is_omap44xx()) ->>> + if (omap_rev() >= OMAP3630_REV_ES1_0) +>>> ? ? ? dma_stride ? ? ? ? ? ? ?= OMAP2_DMA_STRIDE; +>>> ? ? ? dma_common_ch_start ? ? = CSDP; +>>> - ? ? if (cpu_is_omap3630() || cpu_is_omap44xx()) +>>> + ? ? if (omap_rev() >= OMAP3630_REV_ES1_0) >> >> It's not obvious (at least to me) that this is equivalent. >> @@ -66,7 +66,3 @@ Right, this looks better. Thanks, Kevin --- -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 41ca4d0..83de633 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,14 +2,10 @@ "ref\01335952093-12541-5-git-send-email-santosh.shilimkar@ti.com\0" "ref\08762cdgcmu.fsf@ti.com\0" "ref\0CAMQu2gxjEFK3p9CZ0i3ACWTGTQSM6ywMCWUQJg7PMyh2avvL=w@mail.gmail.com\0" - "From\0Kevin Hilman <khilman@ti.com>\0" - "Subject\0Re: [PATCH 4/7] ARM: OMAP: dma: Make use of cpu_class_is_omap2() to avoid future patching.\0" + "From\0khilman@ti.com (Kevin Hilman)\0" + "Subject\0[PATCH 4/7] ARM: OMAP: dma: Make use of cpu_class_is_omap2() to avoid future patching.\0" "Date\0Fri, 04 May 2012 09:46:17 -0700\0" - "To\0Shilimkar" - " Santosh <santosh.shilimkar@ti.com>\0" - "Cc\0linux-omap@vger.kernel.org" - linux-arm-kernel@lists.infradead.org - " tony@atomide.com\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "\"Shilimkar, Santosh\" <santosh.shilimkar@ti.com> writes:\n" @@ -26,9 +22,9 @@ ">>>\n" ">>> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>\n" ">>> ---\n" - ">>> \302\240arch/arm/mach-omap2/dma.c | \302\240 \302\2402 +-\n" - ">>> \302\240arch/arm/plat-omap/dma.c \302\240| \302\240 \302\2404 ++--\n" - ">>> \302\2402 files changed, 3 insertions(+), 3 deletions(-)\n" + ">>> ?arch/arm/mach-omap2/dma.c | ? ?2 +-\n" + ">>> ?arch/arm/plat-omap/dma.c ?| ? ?4 ++--\n" + ">>> ?2 files changed, 3 insertions(+), 3 deletions(-)\n" ">>>\n" ">>> diff --git a/arch/arm/mach-omap2/dma.c b/arch/arm/mach-omap2/dma.c\n" ">>> index b19d849..2750bb9 100644\n" @@ -36,10 +32,10 @@ ">>> +++ b/arch/arm/mach-omap2/dma.c\n" ">>> @@ -227,7 +227,7 @@ static int __init omap2_system_dma_init_dev(struct omap_hwmod *oh, void *unused)\n" ">>>\n" - ">>> \302\240 \302\240 \302\240 dma_stride \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240= OMAP2_DMA_STRIDE;\n" - ">>> \302\240 \302\240 \302\240 dma_common_ch_start \302\240 \302\240 = CSDP;\n" - ">>> - \302\240 \302\240 if (cpu_is_omap3630() || cpu_is_omap44xx())\n" - ">>> + \302\240 \302\240 if (omap_rev() >= OMAP3630_REV_ES1_0)\n" + ">>> ? ? ? dma_stride ? ? ? ? ? ? ?= OMAP2_DMA_STRIDE;\n" + ">>> ? ? ? dma_common_ch_start ? ? = CSDP;\n" + ">>> - ? ? if (cpu_is_omap3630() || cpu_is_omap44xx())\n" + ">>> + ? ? if (omap_rev() >= OMAP3630_REV_ES1_0)\n" ">>\n" ">> It's not obvious (at least to me) that this is equivalent.\n" ">>\n" @@ -79,10 +75,6 @@ "\n" "Thanks,\n" "\n" - "Kevin\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 + Kevin -f7b4f35fe8ba93c30f4bb0766da0bc74aac8207ff0535564e9c89bb0626c5dc2 +f52536629713cfbac0ad5c6def7853e692fda76bf6df6a032c5e99212cb1010c
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.