Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...

[linux-2.6-omap-h63xx.git] / drivers / sbus / char / Kconfig

diff --git a/drivers/sbus/char/Kconfig b/drivers/sbus/char/Kconfig
index a41778a490d600e9de43829e927430c9ea849f7b..400c65bfb8c75f338664b9ebb11fb337ed0c23ea 100644 (file)
--- a/drivers/sbus/char/Kconfig
+++ b/drivers/sbus/char/Kconfig
@@ -15,6 +15,7 @@ config SUN_OPENPROMIO
 
 config SUN_MOSTEK_RTC
        tristate "Mostek real time clock support"
+       depends on SPARC32
        help
          The Mostek RTC chip is used on all known Sun computers except
          some JavaStations. For a JavaStation you need to say Y both here
@@ -46,13 +47,6 @@ config SUN_VIDEOPIX
          based on the Phillips SAA9051, can handle NTSC and PAL/SECAM and
          SVIDEO signals.
 
-config SUN_AURORA
-       tristate "Aurora Multiboard 1600se (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && BROKEN
-       help
-         The Aurora Multiboard is a multi-port high-speed serial controller.
-         If you have one of these, say Y.
-
 config TADPOLE_TS102_UCTRL
        tristate "Tadpole TS102 Microcontroller support (EXPERIMENTAL)"
        depends on EXPERIMENTAL && SPARC32
@@ -69,11 +63,40 @@ config SUN_JSFLASH
          If you say Y here, you will be able to boot from your JavaStation's
          Flash memory.
 
-# XXX Why don't we do "source drivers/char/Config.in" somewhere?
-# no shit
-config RTC
-       tristate "PC-style Real Time Clock Support"
-       depends on PCI && EXPERIMENTAL && SPARC32
+config BBC_I2C
+       tristate "UltraSPARC-III bootbus i2c controller driver"
+       depends on PCI && SPARC64
+       help
+         The BBC devices on the UltraSPARC III have two I2C controllers.  The
+         first I2C controller connects mainly to configuration PROMs (NVRAM,
+         CPU configuration, DIMM types, etc.).  The second I2C controller
+         connects to environmental control devices such as fans and
+         temperature sensors.  The second controller also connects to the
+         smartcard reader, if present.  Say Y to enable support for these.
+
+config ENVCTRL
+       tristate "SUNW, envctrl support"
+       depends on PCI && SPARC64
+       help
+         Kernel support for temperature and fan monitoring on Sun SME
+         machines.
+
+         To compile this driver as a module, choose M here: the
+         module will be called envctrl.
+
+config DISPLAY7SEG
+       tristate "7-Segment Display support"
+       depends on PCI && SPARC64
+       ---help---
+         This is the driver for the 7-segment display and LED present on
+         Sun Microsystems CompactPCI models CP1400 and CP1500.
+
+         To compile this driver as a module, choose M here: the
+         module will be called display7seg.
+
+         If you do not have a CompactPCI model CP1400 or CP1500, or
+         another UltraSPARC-IIi-cEngine boardset with a 7-segment display,
+         you should say N to this option.
 
 endmenu