Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1db4e9bb5682fd3fd3f37f7fe9c322e7c5bb7578 Commit: 1db4e9bb5682fd3fd3f37f7fe9c322e7c5bb7578 Parent: d581593388e39d77acd643b1d7427c5ecbb85a03 Author: Paul Mundt <[EMAIL PROTECTED]> AuthorDate: Tue Sep 11 18:10:23 2007 +0900 Committer: Paul Mundt <[EMAIL PROTECTED]> CommitDate: Fri Sep 21 11:57:53 2007 +0900
sh: Don't enable FPU for SH4AL-DSP. This leads to invalid configurations where both FPU and DSP support can be enabled in the same kernel, resulting in build failure. Signed-off-by: Paul Mundt <[EMAIL PROTECTED]> --- arch/sh/Kconfig | 5 ++++- arch/sh/mm/Kconfig | 1 + 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index c1214cc..f6d6ac3 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -118,7 +118,7 @@ endchoice config SH_FPU bool "FPU support" - depends on CPU_SH4 + depends on CPU_HAS_FPU default y help Selecting this option will enable support for SH processors that @@ -199,6 +199,9 @@ config CPU_HAS_PTEA config CPU_HAS_DSP bool +config CPU_HAS_FPU + bool + endmenu menu "Board support" diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig index 5a92b3b..96775ff 100644 --- a/arch/sh/mm/Kconfig +++ b/arch/sh/mm/Kconfig @@ -18,6 +18,7 @@ config CPU_SH4 select CPU_HAS_INTEVT select CPU_HAS_SR_RB select CPU_HAS_PTEA if (!CPU_SUBTYPE_ST40 && !CPU_SH4A) || CPU_SHX2 + select CPU_HAS_FPU if !CPU_SH4AL_DSP config CPU_SH4A bool - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html