| Submitter | Sanjeev Premi |
|---|---|
| Date | 2009-10-28 13:09:42 |
| Message ID | <1256735382-18709-1-git-send-email-premi@ti.com> |
| Download | mbox | patch |
| Permalink | /patch/56283/ |
| State | Accepted |
| Commit | d298760e4faf8112f2adb47b6b60144f8049f3b1 |
| Delegated to: | Tony Lindgren |
| Headers | show |
Comments
This patch has been applied to the linux-omap by youw fwiendly patch wobot. Branch in linux-omap: for-next Initial commit ID (Likely to change): d298760e4faf8112f2adb47b6b60144f8049f3b1 PatchWorks http://patchwork.kernel.org/patch/56283/ Git (Likely to change, and takes a while to get mirrored) http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=d298760e4faf8112f2adb47b6b60144f8049f3b1 -- 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
Patch
diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h index 7cb0556..f4f7a2f 100644 --- a/arch/arm/plat-omap/include/plat/cpu.h +++ b/arch/arm/plat-omap/include/plat/cpu.h @@ -381,16 +381,16 @@ IS_OMAP_TYPE(3430, 0x3430) # undef cpu_is_omap3525 # undef cpu_is_omap3530 # define cpu_is_omap3430() is_omap3430() -# define cpu_is_omap3503 (cpu_is_omap3430() && \ +# define cpu_is_omap3503() (cpu_is_omap3430() && \ (!omap3_has_iva()) && \ (!omap3_has_sgx())) -# define cpu_is_omap3515 (cpu_is_omap3430() && \ +# define cpu_is_omap3515() (cpu_is_omap3430() && \ (omap3_has_iva()) && \ (!omap3_has_sgx())) -# define cpu_is_omap3525 (cpu_is_omap3430() && \ +# define cpu_is_omap3525() (cpu_is_omap3430() && \ (omap3_has_sgx()) && \ (!omap3_has_iva())) -# define cpu_is_omap3530 (cpu_is_omap3430()) +# define cpu_is_omap3530() (cpu_is_omap3430()) # undef cpu_is_omap3630 # define cpu_is_omap3630() is_omap363x() #endif
This fix avoids the compile errors in specific cases. Found the problem while creating the v2 patch for AM35xx. Signed-off-by: Sanjeev Premi <premi@ti.com> --- arch/arm/plat-omap/include/plat/cpu.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)