Merge master.kernel.org:/home/rmk/linux-2.6-mmc

[powerpc.git] / arch / sparc / Kconfig

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index f7c51b8..3cfb8be 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -21,10 +21,6 @@ config GENERIC_ISA_DMA
        bool
        default y
 
-config GENERIC_IOMAP
-       bool
-       default y
-
 source "init/Kconfig"
 
 menu "General machine setup"
@@ -205,6 +201,14 @@ config SUN_OPENPROMFS
          Only choose N if you know in advance that you will not need to modify
          OpenPROM settings on the running system.
 
+config SPARC_LED
+       tristate "Sun4m LED driver"
+       help
+         This driver toggles the front-panel LED on sun4m systems
+         in a user-specifyable manner.  It's state can be probed
+         by reading /proc/led and it's blinking mode can be changed
+         via writes to /proc/led
+
 source "fs/Kconfig.binfmt"
 
 config SUNOS_EMUL