[ARM PATCH] 2310/1: CONFIG_FPE_NWFPE enabled in (integrator|versatile)_defconfig

Patch from Catalin Marinas

CONFIG_FPE_NWFPE was enabled and CONFIG_FPE_FASTFPE disabled in the
(integrator|versatile)_defconfig files because the latter is only
available as a separate patch.

Signed-off-by: Catalin Marinas
Signed-off-by: Russell King

diff --git a/arch/arm/configs/integrator_defconfig b/arch/arm/configs/integrator_defconfig
index 8e2413266d6677f766bf19f0437d3213e7d9560d..e8c1f0592287f95d67b56148ea9c25e4330e609e 100644 (file)
--- a/arch/arm/configs/integrator_defconfig
+++ b/arch/arm/configs/integrator_defconfig
@@ -124,8 +124,8 @@ CONFIG_NET=y
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
-# CONFIG_FPE_NWFPE is not set
-CONFIG_FPE_FASTFPE=y
+CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
 CONFIG_KCORE_ELF=y
 # CONFIG_KCORE_AOUT is not set
 CONFIG_BINFMT_AOUT=y

diff --git a/arch/arm/configs/versatile_defconfig b/arch/arm/configs/versatile_defconfig
index f5ece2491661ae2a64e0703a8fddcfa9fac309f0..e98f061a89ec27e22050d8314919599efac8618c 100644 (file)
--- a/arch/arm/configs/versatile_defconfig
+++ b/arch/arm/configs/versatile_defconfig
@@ -150,8 +150,8 @@ CONFIG_ZBOOT_ROM_BSS=0x0
 #
 # At least one math emulation must be selected
 #
-# CONFIG_FPE_NWFPE is not set
-CONFIG_FPE_FASTFPE=y
+CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_AOUT is not set
 # CONFIG_BINFMT_MISC is not set