powerpc/spufs: Don't spu_acquire_saved unnecessarily in regs read

[linux-2.6-omap-h63xx.git] / arch / cris / Kconfig

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index e6d440ae5e5b283e5a5597b31bb893f737580b6e..9389d38f222f2f749497b106872278a7da5bdd0b 100644 (file)
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -54,6 +54,11 @@ config FORCE_MAX_ZONEORDER
 config CRIS
        bool
        default y
+       select HAVE_IDE
+
+config HZ
+       int
+       default 100
 
 source "init/Kconfig"
 
@@ -259,6 +264,21 @@ menu "Drivers for built-in interfaces"
 source arch/cris/arch-v10/drivers/Kconfig
 source arch/cris/arch-v32/drivers/Kconfig
 
+config ETRAX_AXISFLASHMAP
+       bool "Axis flash-map support"
+       select MTD
+       select MTD_CFI
+       select MTD_CFI_AMDSTD
+       select MTD_JEDECPROBE if ETRAX_ARCH_V32
+       select MTD_CHAR
+       select MTD_BLOCK
+       select MTD_PARTITIONS
+       select MTD_CONCAT
+       select MTD_COMPLEX_MAPPINGS
+       help
+         This option enables MTD mapping of flash devices.  Needed to use
+         flash memories.  If unsure, say Y.
+
 config ETRAX_RTC
        bool "Real Time Clock support"
        depends on ETRAX_I2C