update

[l4.git] / kernel / fiasco / src / templates / globalconfig.out.arm-int-1

diff --git a/kernel/fiasco/src/templates/globalconfig.out.arm-int-1 b/kernel/fiasco/src/templates/globalconfig.out.arm-int-1
index ecfd641a21f95db5c634569ad5aed6b5f48d18d5..92976ecce807b68d8435d8c79cfbfe2c0b046ec1 100644 (file)
--- a/kernel/fiasco/src/templates/globalconfig.out.arm-int-1
+++ b/kernel/fiasco/src/templates/globalconfig.out.arm-int-1
@@ -12,8 +12,8 @@ CONFIG_ARM=y
 # CONFIG_PF_S3C2410 is not set
 # CONFIG_PF_TEGRA2 is not set
 # CONFIG_PF_OMAP is not set
-# CONFIG_PF_XSCALE is not set
 # CONFIG_PF_SA1100 is not set
+# CONFIG_PF_XSCALE is not set
 # CONFIG_PF_KIRKWOOD is not set
 CONFIG_PF_INTEGRATOR=y
 CONFIG_BSP_NAME="integrator"
@@ -24,6 +24,7 @@ CONFIG_ARM_926=y
 # CONFIG_ARM_1176 is not set
 # CONFIG_ARM_ALIGNMENT_CHECK is not set
 # CONFIG_FPU is not set
+# CONFIG_ARM_CPU_ERRATA is not set
 
 #
 # Kernel options