2 files changed, 54 insertions, 313 deletions

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 9afd28e2c4d5..17846f4ba9b6 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -5,6 +5,16 @@
 
 mainmenu "Linux/UltraSPARC Kernel Configuration"
 
+config SPARC64
+        bool
+        default y
+        help
+          SPARC is a family of RISC microprocessors designed and marketed by
+          Sun Microsystems, incorporated.  This port covers the newer 64-bit
+          UltraSPARC.  The UltraLinux project maintains both the SPARC32 and
+          SPARC64 ports; its web page is available at
+          <http://www.ultralinux.org/>.
+
 config 64BIT
         def_bool y
 
@@ -71,75 +81,6 @@ config SYSVIPC_COMPAT
 
 menu "General machine setup"
 
-config BBC_I2C
-        tristate "UltraSPARC-III bootbus i2c controller driver"
-        depends on PCI
-        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 VT
-        bool "Virtual terminal" if EMBEDDED
-        select INPUT
-        default y
-        ---help---
-          If you say Y here, you will get support for terminal devices with
-          display and keyboard devices. These are called "virtual" because you
-          can run several virtual terminals (also called virtual consoles) on
-          one physical terminal. This is rather useful, for example one
-          virtual terminal can collect system messages and warnings, another
-          one can be used for a text-mode user session, and a third could run
-          an X session, all in parallel. Switching between virtual terminals
-          is done with certain key combinations, usually Alt-<function key>.
-
-          The setterm command ("man setterm") can be used to change the
-          properties (such as colors or beeping) of a virtual terminal. The
-          man page console_codes(4) ("man console_codes") contains the special
-          character sequences that can be used to change those properties
-          directly. The fonts used on virtual terminals can be changed with
-          the setfont ("man setfont") command and the key bindings are defined
-          with the loadkeys ("man loadkeys") command.
-
-          You need at least one virtual terminal device in order to make use
-          of your keyboard and monitor. Therefore, only people configuring an
-          embedded system would want to say N here in order to save some
-          memory; the only way to log into such a system is then via a serial
-          or network connection.
-
-          If unsure, say Y, or else you won't be able to do much with your new
-          shiny Linux system :-)
-
-config VT_CONSOLE
-        bool "Support for console on virtual terminal" if EMBEDDED
-        depends on VT
-        default y
-        ---help---
-          The system console is the device which receives all kernel messages
-          and warnings and which allows logins in single user mode. If you
-          answer Y here, a virtual terminal (the device used to interact with
-          a physical terminal) can be used as system console. This is the most
-          common mode of operations, so you should say Y here unless you want
-          the kernel messages be output only to a serial port (in which case
-          you should say Y to "Console on serial port", below).
-
-          If you do say Y here, by default the currently visible virtual
-          terminal (/dev/tty0) will be used as system console. You can change
-          that with a kernel command line option such as "console=tty3" which
-          would use the third virtual terminal as system console. (Try "man
-          bootparam" or see the documentation of your boot loader (lilo or
-          loadlin) about how to pass options to the kernel at boot time.)
-
-          If unsure, say Y.
-
-config HW_CONSOLE
-        bool
-        depends on VT
-        default y
-
 config SMP
         bool "Symmetric multi-processing support"
         ---help---
@@ -205,17 +146,6 @@ config US2E_FREQ
 
           If in doubt, say N.
 
-# Identify this as a Sparc64 build
-config SPARC64
-        bool
-        default y
-        help
-          SPARC is a family of RISC microprocessors designed and marketed by
-          Sun Microsystems, incorporated.  This port covers the newer 64-bit
-          UltraSPARC.  The UltraLinux project maintains both the SPARC32 and
-          SPARC64 ports; its web page is available at
-          <http://www.ultralinux.org/>.
-
 # Global things across all Sun machines.
 config RWSEM_GENERIC_SPINLOCK
         bool
@@ -246,6 +176,12 @@ config HUGETLB_PAGE_SIZE_64K
 
 endchoice
 
+endmenu
+
+source "drivers/firmware/Kconfig"
+
+source "mm/Kconfig"
+
 config GENERIC_ISA_DMA
         bool
         default y
@@ -344,33 +280,6 @@ config PCI_DOMAINS
         bool
         default PCI
 
-config RTC
-        tristate
-        depends on PCI
-        default y
-        ---help---
-          If you say Y here and create a character special file /dev/rtc with
-          major number 10 and minor number 135 using mknod ("man mknod"), you
-          will get access to the real time clock (or hardware clock) built
-          into your computer.
-
-          Every PC has such a clock built in. It can be used to generate
-          signals from as low as 1Hz up to 8192Hz, and can also be used
-          as a 24 hour alarm. It reports status information via the file
-          /proc/driver/rtc and its behaviour is set by various ioctls on
-          /dev/rtc.
-
-          If you run Linux on a multiprocessor machine and said Y to
-          "Symmetric Multi Processing" above, you should say Y here to read
-          and set the RTC in an SMP compatible fashion.
-
-          If you think you have a use for such a device (such as periodic data
-          sampling), then say Y here, and read <file:Documentation/rtc.txt>
-          for details.
-
-          To compile this driver as a module, choose M here: the
-          module will be called rtc.
-
 source "drivers/pci/Kconfig"
 
 config SUN_OPENPROMFS
@@ -414,6 +323,8 @@ config BINFMT_AOUT32
           If you want to run SunOS binaries (see SunOS binary emulation below)
           or other a.out binaries, say Y. If unsure, say N.
 
+menu "Executable file formats"
+
 source "fs/Kconfig.binfmt"
 
 config SUNOS_EMUL
@@ -436,74 +347,7 @@ config SOLARIS_EMUL
           To compile this code as a module, choose M here: the
           module will be called solaris.
 
-source "drivers/parport/Kconfig"
-
-config PRINTER
-        tristate "Parallel printer support"
-        depends on PARPORT
-        ---help---
-          If you intend to attach a printer to the parallel port of your Linux
-          box (as opposed to using a serial printer; if the connector at the
-          printer has 9 or 25 holes ["female"], then it's serial), say Y.
-          Also read the Printing-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-
-          It is possible to share one parallel port among several devices
-          (e.g. printer and ZIP drive) and it is safe to compile the
-          corresponding drivers into the kernel.
-          To compile this driver as a module, choose M here and read
-          <file:Documentation/parport.txt>.  The module will be called lp.
-
-          If you have several parallel ports, you can specify which ports to
-          use with the "lp" kernel command line option.  (Try "man bootparam"
-          or see the documentation of your boot loader (lilo or loadlin) about
-          how to pass options to the kernel at boot time.)  The syntax of the
-          "lp" command line option can be found in <file:drivers/char/lp.c>.
-
-          If you have more than 8 printers, you need to increase the LP_NO
-          macro in lp.c and the PARPORT_MAX macro in parport.h.
-
-config PPDEV
-        tristate "Support for user-space parallel port device drivers"
-        depends on PARPORT
-        ---help---
-          Saying Y to this adds support for /dev/parport device nodes.  This
-          is needed for programs that want portable access to the parallel
-          port, for instance deviceid (which displays Plug-and-Play device
-          IDs).
-
-          This is the parallel port equivalent of SCSI generic support (sg).
-          It is safe to say N to this -- it is not needed for normal printing
-          or parallel port CD-ROM/disk support.
-
-          To compile this driver as a module, choose M here: the
-          module will be called ppdev.
-
-          If unsure, say N.
-
-config ENVCTRL
-        tristate "SUNW, envctrl support"
-        depends on PCI
-        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
-        ---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
 
 config CMDLINE_BOOL
         bool "Default bootloader kernel arguments"
@@ -521,148 +365,16 @@ config CMDLINE
 
           NOTE: This option WILL override the PROM bootargs setting!
 
-source "mm/Kconfig"
-
-endmenu
-
 source "net/Kconfig"
 
-source "drivers/base/Kconfig"
-
-source "drivers/video/Kconfig"
-
-source "drivers/serial/Kconfig"
+source "drivers/Kconfig"
 
 source "drivers/sbus/char/Kconfig"
 
-source "drivers/mtd/Kconfig"
-
-source "drivers/block/Kconfig"
-
-source "drivers/ide/Kconfig"
-
-source "drivers/scsi/Kconfig"
-
 source "drivers/fc4/Kconfig"
 
-source "drivers/md/Kconfig"
-
-if PCI
-source "drivers/message/fusion/Kconfig"
-endif
-
-source "drivers/ieee1394/Kconfig"
-
-source "drivers/net/Kconfig"
-
-source "drivers/isdn/Kconfig"
-
-source "drivers/telephony/Kconfig"
-
-# This one must be before the filesystem configs. -DaveM
-
-menu "Unix98 PTY support"
-
-config UNIX98_PTYS
-        bool "Unix98 PTY support"
-        ---help---
-          A pseudo terminal (PTY) is a software device consisting of two
-          halves: a master and a slave. The slave device behaves identical to
-          a physical terminal; the master device is used by a process to
-          read data from and write data to the slave, thereby emulating a
-          terminal. Typical programs for the master side are telnet servers
-          and xterms.
-
-          Linux has traditionally used the BSD-like names /dev/ptyxx for
-          masters and /dev/ttyxx for slaves of pseudo terminals. This scheme
-          has a number of problems. The GNU C library glibc 2.1 and later,
-          however, supports the Unix98 naming standard: in order to acquire a
-          pseudo terminal, a process opens /dev/ptmx; the number of the pseudo
-          terminal is then made available to the process and the pseudo
-          terminal slave can be accessed as /dev/pts/<number>. What was
-          traditionally /dev/ttyp2 will then be /dev/pts/2, for example.
-
-          The entries in /dev/pts/ are created on the fly by a virtual
-          file system; therefore, if you say Y here you should say Y to
-          "/dev/pts file system for Unix98 PTYs" as well.
-
-          If you want to say Y here, you need to have the C library glibc 2.1
-          or later (equal to libc-6.1, check with "ls -l /lib/libc.so.*").
-          Read the instructions in <file:Documentation/Changes> pertaining to
-          pseudo terminals. It's safe to say N.
-
-config UNIX98_PTY_COUNT
-        int "Maximum number of Unix98 PTYs in use (0-2048)"
-        depends on UNIX98_PTYS
-        default "256"
-        help
-          The maximum number of Unix98 PTYs that can be used at any one time.
-          The default is 256, and should be enough for desktop systems. Server
-          machines which support incoming telnet/rlogin/ssh connections and/or
-          serve several X terminals may want to increase this: every incoming
-          connection and every xterm uses up one PTY.
-
-          When not in use, each additional set of 256 PTYs occupy
-          approximately 8 KB of kernel memory on 32-bit architectures.
-
-endmenu
-
-menu "XFree86 DRI support"
-
-config DRM
-        bool "Direct Rendering Manager (XFree86 DRI support)"
-        help
-          Kernel-level support for the Direct Rendering Infrastructure (DRI)
-          introduced in XFree86 4.0. If you say Y here, you need to select
-          the module that's right for your graphics card from the list below.
-          These modules provide support for synchronization, security, and
-          DMA transfers. Please see <http://dri.sourceforge.net/> for more
-          details.  You should also select and configure AGP
-          (/dev/agpgart) support.
-
-config DRM_FFB
-        tristate "Creator/Creator3D"
-        depends on DRM && BROKEN
-        help
-          Choose this option if you have one of Sun's Creator3D-based graphics
-          and frame buffer cards.  Product page at
-          <http://www.sun.com/desktop/products/Graphics/creator3d.html>.
-
-config DRM_TDFX
-        tristate "3dfx Banshee/Voodoo3+"
-        depends on DRM
-        help
-          Choose this option if you have a 3dfx Banshee or Voodoo3 (or later),
-          graphics card.  If M is selected, the module will be called tdfx.
-
-config DRM_R128
-        tristate "ATI Rage 128"
-        depends on DRM
-        help
-          Choose this option if you have an ATI Rage 128 graphics card.  If M
-          is selected, the module will be called r128.  AGP support for
-          this card is strongly suggested (unless you have a PCI version).
-
-endmenu
-
-source "drivers/input/Kconfig"
-
-source "drivers/i2c/Kconfig"
-
-source "drivers/hwmon/Kconfig"
-
 source "fs/Kconfig"
 
-source "drivers/media/Kconfig"
-
-source "sound/Kconfig"
-
-source "drivers/usb/Kconfig"
-
-source "drivers/infiniband/Kconfig"
-
-source "drivers/char/watchdog/Kconfig"
-
 source "arch/sparc64/oprofile/Kconfig"
 
 source "arch/sparc64/Kconfig.debug"
diff --git a/drivers/sbus/char/Kconfig b/drivers/sbus/char/Kconfig
index a41778a490d6..3a8152906bf6 100644
--- a/drivers/sbus/char/Kconfig
+++ b/drivers/sbus/char/Kconfig
@@ -69,11 +69,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