diff for duplicates of <20091111192315.GA29757@rainbow> diff --git a/a/1.txt b/N1/1.txt index 0a072d3..c0148c0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -26,42 +26,3 @@ Any ideas are welcome. -- Best regards, Dmitry "MAD" Artamonow - --------------- next part -------------- -diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c -index 23cfdd5..59a21c6 100644 ---- a/arch/arm/mach-sa1100/generic.c -+++ b/arch/arm/mach-sa1100/generic.c -@@ -110,15 +110,6 @@ unsigned int sa11x0_getspeed(unsigned int cpu) - return cclk_frequency_100khz[PPCR & 0xf] * 100; - } - --#else --/* -- * We still need to provide this so building without cpufreq works. -- */ --unsigned int cpufreq_get(unsigned int cpu) --{ -- return cclk_frequency_100khz[PPCR & 0xf] * 100; --} --EXPORT_SYMBOL(cpufreq_get); - #endif - - /* -diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c -index cdaa873..4f2e4fe 100644 ---- a/drivers/video/sa1100fb.c -+++ b/drivers/video/sa1100fb.c -@@ -923,7 +923,12 @@ static int sa1100fb_activate_var(struct fb_var_screeninfo *var, struct sa1100fb_ - LCCR2_BegFrmDel(var->upper_margin) + - LCCR2_EndFrmDel(var->lower_margin); - -+#ifdef CONFIG_CPU_FREQ - pcd = get_pcd(var->pixclock, cpufreq_get(0)); -+#else -+ pcd = get_pcd(var->pixclock, 206400); -+#endif -+ - new_regs.lccr3 = LCCR3_PixClkDiv(pcd) | fbi->lccr3 | - (var->sync & FB_SYNC_HOR_HIGH_ACT ? LCCR3_HorSnchH : LCCR3_HorSnchL) | - (var->sync & FB_SYNC_VERT_HIGH_ACT ? LCCR3_VrtSnchH : LCCR3_VrtSnchL); diff --git a/N1/2.hdr b/N1/2.hdr new file mode 100644 index 0000000..56a9845 --- /dev/null +++ b/N1/2.hdr @@ -0,0 +1,2 @@ +Content-Type: text/plain; charset=us-ascii +Content-Disposition: attachment; filename="fix-strongarm-build.diff" diff --git a/N1/2.txt b/N1/2.txt new file mode 100644 index 0000000..6ce0b60 --- /dev/null +++ b/N1/2.txt @@ -0,0 +1,37 @@ +diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c +index 23cfdd5..59a21c6 100644 +--- a/arch/arm/mach-sa1100/generic.c ++++ b/arch/arm/mach-sa1100/generic.c +@@ -110,15 +110,6 @@ unsigned int sa11x0_getspeed(unsigned int cpu) + return cclk_frequency_100khz[PPCR & 0xf] * 100; + } + +-#else +-/* +- * We still need to provide this so building without cpufreq works. +- */ +-unsigned int cpufreq_get(unsigned int cpu) +-{ +- return cclk_frequency_100khz[PPCR & 0xf] * 100; +-} +-EXPORT_SYMBOL(cpufreq_get); + #endif + + /* +diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c +index cdaa873..4f2e4fe 100644 +--- a/drivers/video/sa1100fb.c ++++ b/drivers/video/sa1100fb.c +@@ -923,7 +923,12 @@ static int sa1100fb_activate_var(struct fb_var_screeninfo *var, struct sa1100fb_ + LCCR2_BegFrmDel(var->upper_margin) + + LCCR2_EndFrmDel(var->lower_margin); + ++#ifdef CONFIG_CPU_FREQ + pcd = get_pcd(var->pixclock, cpufreq_get(0)); ++#else ++ pcd = get_pcd(var->pixclock, 206400); ++#endif ++ + new_regs.lccr3 = LCCR3_PixClkDiv(pcd) | fbi->lccr3 | + (var->sync & FB_SYNC_HOR_HIGH_ACT ? LCCR3_HorSnchH : LCCR3_HorSnchL) | + (var->sync & FB_SYNC_VERT_HIGH_ACT ? LCCR3_VrtSnchH : LCCR3_VrtSnchL); diff --git a/a/content_digest b/N1/content_digest index 64d2a9f..85af557 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,10 @@ - "From\0mad_soft@inbox.ru (Dmitry Artamonow)\0" + "From\0Dmitry Artamonow <mad_soft@inbox.ru>\0" "Subject\0[REGRESSION] 2eca40a8 breaks StrongARM compilation\0" "Date\0Wed, 11 Nov 2009 22:23:15 +0300\0" "To\0linux-arm-kernel@lists.infradead.org\0" - "\00:1\0" + "Cc\0Randy Dunlap <randy.dunlap@oracle.com>" + " linux-kernel@vger.kernel.org\0" + "\01:1\0" "b\0" "Commit 2eca40a8 which went into 2.6.32-rc6 breaks compilation\n" "for ipaq h3600 and probably other SA1100 machines when CONFIG_CPU_FREQ\n" @@ -31,9 +33,10 @@ "\n" "-- \n" "Best regards,\n" - "Dmitry \"MAD\" Artamonow\n" - "\n" - "-------------- next part --------------\n" + "Dmitry \"MAD\" Artamonow" + "\01:2\0" + "fn\0fix-strongarm-build.diff\0" + "b\0" "diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c\n" "index 23cfdd5..59a21c6 100644\n" "--- a/arch/arm/mach-sa1100/generic.c\n" @@ -72,4 +75,4 @@ " \t\t(var->sync & FB_SYNC_HOR_HIGH_ACT ? LCCR3_HorSnchH : LCCR3_HorSnchL) |\n" " \t\t(var->sync & FB_SYNC_VERT_HIGH_ACT ? LCCR3_VrtSnchH : LCCR3_VrtSnchL);" -48b33374a613e2cfcbc0c3f7624b11aa929ecc58aa7ce0f3c41be0f969bfd55a +6168eec9d2f4ed0537adbdcbeb5056e89496482365eb872be5c29d938161d0de
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.