Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

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

diff --git a/arch/cris/arch-v10/Kconfig b/arch/cris/arch-v10/Kconfig
index 44eb1b9accb374c89f3a0f75ebe39693ae53a7f0..1d61faec77cd0b01241462104bf1747e3b6a508d 100644 (file)
--- a/arch/cris/arch-v10/Kconfig
+++ b/arch/cris/arch-v10/Kconfig
@@ -1,3 +1,5 @@
+if ETRAX_ARCH_V10
+
 # ETRAX 100LX v1 has a MMU "feature" requiring a low mapping
 config CRIS_LOW_MAP
        bool
@@ -182,7 +184,7 @@ config ETRAX_LED7G
          set this to same as CONFIG_ETRAX_LED1G (normally 2).
 
 config ETRAX_LED8Y
-       int "Eigth yellow LED bit"
+       int "Eighth yellow LED bit"
        depends on ETRAX_CSP0_LEDS
        default "2"
        help
@@ -323,7 +325,7 @@ config ETRAX_DEF_R_WAITSTATES
        depends on ETRAX_ARCH_V10
        default "95a6"
        help
-         Waitstates for SRAM, Flash and peripherials (not DRAM).  95f8 is a
+         Waitstates for SRAM, Flash and peripherals (not DRAM).  95f8 is a
          good choice for most Axis products...
 
 config ETRAX_DEF_R_BUS_CONFIG
@@ -451,3 +453,5 @@ config ETRAX_POWERBUTTON_BIT
        default "25"
        help
          Configure where power button is connected.
+
+endif