bfin-otp: add BF51x to the supported arch list

[safe/jmp/linux-2.6] / drivers / char / Kconfig

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index b391776..31be3ac 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -8,7 +8,7 @@ config VT
        bool "Virtual terminal" if EMBEDDED
        depends on !S390
        select INPUT
        bool "Virtual terminal" if EMBEDDED
        depends on !S390
        select INPUT

-       default y if !VIOCONS
+       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
        ---help---
          If you say Y here, you will get support for terminal devices with
          display and keyboard devices. These are called "virtual" because you


@@ -36,6 +36,14 @@ config VT
          If unsure, say Y, or else you won't be able to do much with your new
          shiny Linux system :-)
 
          If unsure, say Y, or else you won't be able to do much with your new
          shiny Linux system :-)
 

+config CONSOLE_TRANSLATIONS
+       depends on VT
+       default y
+       bool "Enable character translations in console" if EMBEDDED
+       ---help---
+         This enables support for font mapping and Unicode translation
+         on virtual consoles.
+

 config VT_CONSOLE
        bool "Support for console on virtual terminal" if EMBEDDED
        depends on VT
 config VT_CONSOLE
        bool "Support for console on virtual terminal" if EMBEDDED
        depends on VT


@@ -80,6 +88,28 @@ config VT_HW_CONSOLE_BINDING
         information. For framebuffer console users, please refer to
         <file:Documentation/fb/fbcon.txt>.
 
         information. For framebuffer console users, please refer to
         <file:Documentation/fb/fbcon.txt>.
 

+config DEVKMEM
+       bool "/dev/kmem virtual device support"
+       default y
+       help
+         Say Y here if you want to support the /dev/kmem device. The
+         /dev/kmem device is rarely used, but can be used for certain
+         kind of kernel debugging operations.
+         When in doubt, say "N".
+
+config BFIN_JTAG_COMM
+       tristate "Blackfin JTAG Communication"
+       depends on BLACKFIN
+       help
+         Add support for emulating a TTY device over the Blackfin JTAG.
+
+         To compile this driver as a module, choose M here: the
+         module will be called bfin_jtag_comm.
+
+config BFIN_JTAG_COMM_CONSOLE
+       bool "Console on Blackfin JTAG"
+       depends on BFIN_JTAG_COMM=y
+

 config SERIAL_NONSTANDARD
        bool "Non-standard serial port support"
        depends on HAS_IOMEM
 config SERIAL_NONSTANDARD
        bool "Non-standard serial port support"
        depends on HAS_IOMEM


@@ -107,10 +137,10 @@ config COMPUTONE
          which give you many serial ports. You would need something like this
          to connect more than two modems to your Linux box, for instance in
          order to become a dial-in server. If you have a card like that, say
          which give you many serial ports. You would need something like this
          to connect more than two modems to your Linux box, for instance in
          order to become a dial-in server. If you have a card like that, say

-         Y here and read <file:Documentation/computone.txt>.
+         Y here and read <file:Documentation/serial/computone.txt>.

 
 

-         To compile this driver as modules, choose M here: the
-         modules will be called ip2 and ip2main.
+         To compile this driver as module, choose M here: the
+         module will be called ip2.

 
 config ROCKETPORT
        tristate "Comtrol RocketPort support"
 
 config ROCKETPORT
        tristate "Comtrol RocketPort support"


@@ -119,7 +149,7 @@ config ROCKETPORT
          This driver supports Comtrol RocketPort and RocketModem PCI boards.   
           These boards provide 2, 4, 8, 16, or 32 high-speed serial ports or
           modems.  For information about the RocketPort/RocketModem  boards
          This driver supports Comtrol RocketPort and RocketModem PCI boards.   
           These boards provide 2, 4, 8, 16, or 32 high-speed serial ports or
           modems.  For information about the RocketPort/RocketModem  boards

-          and this driver read <file:Documentation/rocket.txt>.
+          and this driver read <file:Documentation/serial/rocket.txt>.

 
          To compile this driver as a module, choose M here: the
          module will be called rocket.
 
          To compile this driver as a module, choose M here: the
          module will be called rocket.


@@ -137,7 +167,7 @@ config CYCLADES
          your Linux box, for instance in order to become a dial-in server.
 
          For information about the Cyclades-Z card, read
          your Linux box, for instance in order to become a dial-in server.
 
          For information about the Cyclades-Z card, read

-         <file:drivers/char/README.cycladesZ>.
+         <file:Documentation/serial/README.cycladesZ>.

 
          To compile this driver as a module, choose M here: the
          module will be called cyclades.
 
          To compile this driver as a module, choose M here: the
          module will be called cyclades.


@@ -166,27 +196,15 @@ config DIGIEPCA
          box, for instance in order to become a dial-in server. This driver
          supports the original PC (ISA) boards as well as PCI, and EISA. If
          you have a card like this, say Y here and read the file
          box, for instance in order to become a dial-in server. This driver
          supports the original PC (ISA) boards as well as PCI, and EISA. If
          you have a card like this, say Y here and read the file

-         <file:Documentation/digiepca.txt>.
+         <file:Documentation/serial/digiepca.txt>.

 
          To compile this driver as a module, choose M here: the
          module will be called epca.
 
 
          To compile this driver as a module, choose M here: the
          module will be called epca.
 

-config ESPSERIAL
-       tristate "Hayes ESP serial port support"
-       depends on SERIAL_NONSTANDARD && ISA && ISA_DMA_API
-       help
-         This is a driver which supports Hayes ESP serial ports.  Both single
-         port cards and multiport cards are supported.  Make sure to read
-         <file:Documentation/hayes-esp.txt>.
-
-         To compile this driver as a module, choose M here: the
-         module will be called esp.
-
-         If unsure, say N.
-

 config MOXA_INTELLIO
        tristate "Moxa Intellio support"
        depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
 config MOXA_INTELLIO
        tristate "Moxa Intellio support"
        depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)

+       select FW_LOADER

        help
          Say Y here if you have a Moxa Intellio multiport serial card.
 
        help
          Say Y here if you have a Moxa Intellio multiport serial card.
 


@@ -194,17 +212,6 @@ config MOXA_INTELLIO
          module will be called moxa.
 
 config MOXA_SMARTIO
          module will be called moxa.
 
 config MOXA_SMARTIO

-       tristate "Moxa SmartIO support (OBSOLETE)"
-       depends on SERIAL_NONSTANDARD
-       help
-         Say Y here if you have a Moxa SmartIO multiport serial card.
-
-         This driver can also be built as a module ( = code which can be
-         inserted in and removed from the running kernel whenever you want).
-         The module will be called mxser. If you want to do that, say M
-         here.
-
-config MOXA_SMARTIO_NEW

        tristate "Moxa SmartIO support v. 2.0"
        depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA)
        help
        tristate "Moxa SmartIO support v. 2.0"
        depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA)
        help


@@ -215,7 +222,7 @@ config MOXA_SMARTIO_NEW
          changes finally resulting in PCI probing.
 
          This driver can also be built as a module. The module will be called
          changes finally resulting in PCI probing.
 
          This driver can also be built as a module. The module will be called

-         mxser_new. If you want to do that, say M here.
+         mxser. If you want to do that, say M here.

 
 config ISI
        tristate "Multi-Tech multiport card support (EXPERIMENTAL)"
 
 config ISI
        tristate "Multi-Tech multiport card support (EXPERIMENTAL)"


@@ -276,13 +283,13 @@ config N_HDLC
 
 config RISCOM8
        tristate "SDL RISCom/8 card support"
 
 config RISCOM8
        tristate "SDL RISCom/8 card support"

-       depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
+       depends on SERIAL_NONSTANDARD

        help
          This is a driver for the SDL Communications RISCom/8 multiport card,
          which gives you many serial ports. You would need something like
          this to connect more than two modems to your Linux box, for instance
          in order to become a dial-in server. If you have a card like that,
        help
          This is a driver for the SDL Communications RISCom/8 multiport card,
          which gives you many serial ports. You would need something like
          this to connect more than two modems to your Linux box, for instance
          in order to become a dial-in server. If you have a card like that,

-         say Y here and read the file <file:Documentation/riscom8.txt>.
+         say Y here and read the file <file:Documentation/serial/riscom8.txt>.

 
          Also it's possible to say M here and compile this driver as kernel
          loadable module; the module will be called riscom8.
 
          Also it's possible to say M here and compile this driver as kernel
          loadable module; the module will be called riscom8.


@@ -297,26 +304,16 @@ config SPECIALIX
          your Linux box, for instance in order to become a dial-in server.
 
          If you have a card like that, say Y here and read the file
          your Linux box, for instance in order to become a dial-in server.
 
          If you have a card like that, say Y here and read the file

-         <file:Documentation/specialix.txt>. Also it's possible to say M here
-         and compile this driver as kernel loadable module which will be
+         <file:Documentation/serial/specialix.txt>. Also it's possible to say
+         M here and compile this driver as kernel loadable module which will be

          called specialix.
 
          called specialix.
 

-config SPECIALIX_RTSCTS
-       bool "Specialix DTR/RTS pin is RTS"
-       depends on SPECIALIX
-       help
-         The Specialix IO8+ card can only support either RTS or DTR. If you
-         say N here, the driver will use the pin as "DTR" when the tty is in
-         software handshake mode.  If you say Y here or hardware handshake is
-         on, it will always be RTS.  Read the file
-         <file:Documentation/specialix.txt> for more information.
-

 config SX
        tristate "Specialix SX (and SI) card support"
 config SX
        tristate "Specialix SX (and SI) card support"

-       depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA)
+       depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA) && BROKEN

        help
          This is a driver for the SX and SI multiport serial cards.
        help
          This is a driver for the SX and SI multiport serial cards.

-         Please read the file <file:Documentation/sx.txt> for details.
+         Please read the file <file:Documentation/serial/sx.txt> for details.

 
          This driver can only be built as a module ( = code which can be
          inserted in and removed from the running kernel whenever you want).
 
          This driver can only be built as a module ( = code which can be
          inserted in and removed from the running kernel whenever you want).


@@ -324,7 +321,7 @@ config SX
 
 config RIO
        tristate "Specialix RIO system support"
 
 config RIO
        tristate "Specialix RIO system support"

-       depends on SERIAL_NONSTANDARD
+       depends on SERIAL_NONSTANDARD && BROKEN

        help
          This is a driver for the Specialix RIO, a smart serial card which
          drives an outboard box that can support up to 128 ports.  Product
        help
          This is a driver for the Specialix RIO, a smart serial card which
          drives an outboard box that can support up to 128 ports.  Product


@@ -347,35 +344,45 @@ config STALDRV
          like this to connect more than two modems to your Linux box, for
          instance in order to become a dial-in server.  If you say Y here,
          you will be asked for your specific card model in the next
          like this to connect more than two modems to your Linux box, for
          instance in order to become a dial-in server.  If you say Y here,
          you will be asked for your specific card model in the next

-         questions.  Make sure to read <file:Documentation/stallion.txt> in
-         this case.  If you have never heard about all this, it's safe to
+         questions.  Make sure to read <file:Documentation/serial/stallion.txt>
+         in this case.  If you have never heard about all this, it's safe to

          say N.
 
 config STALLION
        tristate "Stallion EasyIO or EC8/32 support"
          say N.
 
 config STALLION
        tristate "Stallion EasyIO or EC8/32 support"

-       depends on STALDRV && BROKEN_ON_SMP && (ISA || EISA || PCI)
+       depends on STALDRV && (ISA || EISA || PCI)

        help
          If you have an EasyIO or EasyConnection 8/32 multiport Stallion
          card, then this is for you; say Y.  Make sure to read
        help
          If you have an EasyIO or EasyConnection 8/32 multiport Stallion
          card, then this is for you; say Y.  Make sure to read

-         <file:Documentation/stallion.txt>.
+         <file:Documentation/serial/stallion.txt>.

 
          To compile this driver as a module, choose M here: the
          module will be called stallion.
 
 config ISTALLION
        tristate "Stallion EC8/64, ONboard, Brumby support"
 
          To compile this driver as a module, choose M here: the
          module will be called stallion.
 
 config ISTALLION
        tristate "Stallion EC8/64, ONboard, Brumby support"

-       depends on STALDRV && BROKEN_ON_SMP && (ISA || EISA || PCI)
+       depends on STALDRV && (ISA || EISA || PCI)

        help
          If you have an EasyConnection 8/64, ONboard, Brumby or Stallion
          serial multiport card, say Y here. Make sure to read
        help
          If you have an EasyConnection 8/64, ONboard, Brumby or Stallion
          serial multiport card, say Y here. Make sure to read

-         <file:Documentation/stallion.txt>.
+         <file:Documentation/serial/stallion.txt>.

 
          To compile this driver as a module, choose M here: the
          module will be called istallion.
 
 
          To compile this driver as a module, choose M here: the
          module will be called istallion.
 

+config NOZOMI
+       tristate "HSDPA Broadband Wireless Data Card - Globe Trotter"
+       depends on PCI && EXPERIMENTAL
+       help
+         If you have a HSDPA driver Broadband Wireless Data Card -
+         Globe Trotter PCMCIA card, say Y here.
+
+         To compile this driver as a module, choose M here, the module
+         will be called nozomi.
+

 config A2232
        tristate "Commodore A2232 serial support (EXPERIMENTAL)"
 config A2232
        tristate "Commodore A2232 serial support (EXPERIMENTAL)"

-       depends on EXPERIMENTAL && ZORRO && BROKEN_ON_SMP
+       depends on EXPERIMENTAL && ZORRO && BROKEN

        ---help---
          This option supports the 2232 7-port serial card shipped with the
          Amiga 2000 and other Zorro-bus machines, dating from 1989.  At
        ---help---
          This option supports the 2232 7-port serial card shipped with the
          Amiga 2000 and other Zorro-bus machines, dating from 1989.  At


@@ -436,6 +443,17 @@ config UNIX98_PTYS
          All modern Linux systems use the Unix98 ptys.  Say Y unless
          you're on an embedded system and want to conserve memory.
 
          All modern Linux systems use the Unix98 ptys.  Say Y unless
          you're on an embedded system and want to conserve memory.
 

+config DEVPTS_MULTIPLE_INSTANCES
+       bool "Support multiple instances of devpts"
+       depends on UNIX98_PTYS
+       default n
+       ---help---
+         Enable support for multiple instances of devpts filesystem.
+         If you want to have isolated PTY namespaces (eg: in containers),
+         say Y here.  Otherwise, say N. If enabled, each mount of devpts
+         filesystem with the '-o newinstance' option will create an
+         independent PTY namespace.
+

 config LEGACY_PTYS
        bool "Legacy (BSD) PTY support"
        default y
 config LEGACY_PTYS
        bool "Legacy (BSD) PTY support"
        default y


@@ -457,7 +475,7 @@ config LEGACY_PTYS
 config LEGACY_PTY_COUNT
        int "Maximum number of legacy PTY in use"
        depends on LEGACY_PTYS
 config LEGACY_PTY_COUNT
        int "Maximum number of legacy PTY in use"
        depends on LEGACY_PTYS

-       range 1 256
+       range 0 256

        default "256"
        ---help---
          The maximum number of legacy PTYs that can be used at any one time.
        default "256"
        ---help---
          The maximum number of legacy PTYs that can be used at any one time.


@@ -482,6 +500,34 @@ config BRIQ_PANEL
 
          It's safe to say N here.
 
 
          It's safe to say N here.
 

+config BFIN_OTP
+       tristate "Blackfin On-Chip OTP Memory Support"
+       depends on BLACKFIN && (BF51x || BF52x || BF54x)
+       default y
+       help
+         If you say Y here, you will get support for a character device
+         interface into the One Time Programmable memory pages that are
+         stored on the Blackfin processor.  This will not get you access
+         to the secure memory pages however.  You will need to write your
+         own secure code and reader for that.
+
+         To compile this driver as a module, choose M here: the module
+         will be called bfin-otp.
+
+         If unsure, it is safe to say Y.
+
+config BFIN_OTP_WRITE_ENABLE
+       bool "Enable writing support of OTP pages"
+       depends on BFIN_OTP
+       default n
+       help
+         If you say Y here, you will enable support for writing of the
+         OTP pages.  This is dangerous by nature as you can only program
+         the pages once, so only enable this option when you actually
+         need it so as to not inadvertently clobber data.
+
+         If unsure, say N.
+

 config PRINTER
        tristate "Parallel printer support"
        depends on PARPORT
 config PRINTER
        tristate "Parallel printer support"
        depends on PARPORT


@@ -543,41 +589,22 @@ config PPDEV
 
          If unsure, say N.
 
 
          If unsure, say N.
 

-config TIPAR
-       tristate "Texas Instruments parallel link cable support"
-       depends on PARPORT
-       ---help---
-         If you own a Texas Instruments graphing calculator and use a
-         parallel link cable, then you might be interested in this driver.
-
-         If you enable this driver, you will be able to communicate with
-         your calculator through a set of device nodes under /dev. The
-         main advantage of this driver is that you don't have to be root
-         to use this precise link cable (depending on the permissions on
-         the device nodes, though).
-
-         To compile this driver as a module, choose M here: the
-         module will be called tipar.
-
-         If you don't know what a parallel link cable is or what a Texas
-         Instruments graphing calculator is, then you probably don't need this
-         driver.
-
-         If unsure, say N.
-

 config HVC_DRIVER
        bool
        help
 config HVC_DRIVER
        bool
        help

-         Users of pSeries machines that want to utilize the hvc console front-end
-         module for their backend console driver should select this option.
+         Generic "hypervisor virtual console" infrastructure for various
+         hypervisors (pSeries, iSeries, Xen, lguest).

          It will automatically be selected if one of the back-end console drivers
          is selected.
 
          It will automatically be selected if one of the back-end console drivers
          is selected.
 

+config HVC_IRQ
+       bool

 
 config HVC_CONSOLE
        bool "pSeries Hypervisor Virtual Console support"
        depends on PPC_PSERIES
        select HVC_DRIVER
 
 config HVC_CONSOLE
        bool "pSeries Hypervisor Virtual Console support"
        depends on PPC_PSERIES
        select HVC_DRIVER

+       select HVC_IRQ

        help
          pSeries machines when partitioned support a hypervisor virtual
          console. This driver allows each pSeries partition to have a console
        help
          pSeries machines when partitioned support a hypervisor virtual
          console. This driver allows each pSeries partition to have a console


@@ -588,6 +615,8 @@ config HVC_ISERIES
        depends on PPC_ISERIES
        default y
        select HVC_DRIVER
        depends on PPC_ISERIES
        default y
        select HVC_DRIVER

+       select HVC_IRQ
+       select VIOPATH

        help
          iSeries machines support a hypervisor virtual console.
 
        help
          iSeries machines support a hypervisor virtual console.
 


@@ -605,14 +634,39 @@ config HVC_BEAT
        help
          Toshiba's Cell Reference Set Beat Console device driver
 
        help
          Toshiba's Cell Reference Set Beat Console device driver
 

+config HVC_IUCV
+       bool "z/VM IUCV Hypervisor console support (VM only)"
+       depends on S390
+       select HVC_DRIVER
+       select IUCV
+       default y
+       help
+         This driver provides a Hypervisor console (HVC) back-end to access
+         a Linux (console) terminal via a z/VM IUCV communication path.
+

 config HVC_XEN
        bool "Xen Hypervisor Console support"
        depends on XEN
        select HVC_DRIVER
 config HVC_XEN
        bool "Xen Hypervisor Console support"
        depends on XEN
        select HVC_DRIVER

+       select HVC_IRQ

        default y
        help
          Xen virtual console device driver
 
        default y
        help
          Xen virtual console device driver
 

+config HVC_UDBG
+       bool "udbg based fake hypervisor console"
+       depends on PPC && EXPERIMENTAL
+       select HVC_DRIVER
+       default n
+
+config VIRTIO_CONSOLE
+       tristate "Virtio console"
+       depends on VIRTIO
+       select HVC_DRIVER
+       help
+         Virtio console for use with lguest and other hypervisors.
+
+

 config HVCS
        tristate "IBM Hypervisor Virtual Console Server support"
        depends on PPC_PSERIES
 config HVCS
        tristate "IBM Hypervisor Virtual Console Server support"
        depends on PPC_PSERIES


@@ -625,14 +679,20 @@ config HVCS
          this driver.
 
          To compile this driver as a module, choose M here: the
          this driver.
 
          To compile this driver as a module, choose M here: the

-         module will be called hvcs.ko.  Additionally, this module
+         module will be called hvcs.  Additionally, this module

          will depend on arch specific APIs exported from hvcserver.ko
          which will also be compiled when this driver is built as a
          module.
 
          will depend on arch specific APIs exported from hvcserver.ko
          which will also be compiled when this driver is built as a
          module.
 

-source "drivers/char/ipmi/Kconfig"
+config IBM_BSR
+       tristate "IBM POWER Barrier Synchronization Register support"
+       depends on PPC_PSERIES
+       help
+         This devices exposes a hardware mechanism for fast synchronization
+         of threads across a large system which avoids bouncing a cacheline
+         between several cores on a system

 
 

-source "drivers/char/watchdog/Kconfig"
+source "drivers/char/ipmi/Kconfig"

 
 config DS1620
        tristate "NetWinder thermometer support"
 
 config DS1620
        tristate "NetWinder thermometer support"


@@ -701,7 +761,7 @@ source "drivers/char/hw_random/Kconfig"
 
 config NVRAM
        tristate "/dev/nvram support"
 
 config NVRAM
        tristate "/dev/nvram support"

-       depends on ATARI || X86 || ARM || GENERIC_NVRAM
+       depends on ATARI || X86 || (ARM && RTC_DRV_CMOS) || GENERIC_NVRAM

        ---help---
          If you say Y here and create a character special file /dev/nvram
          with major number 10 and minor number 144 using mknod ("man mknod"),
        ---help---
          If you say Y here and create a character special file /dev/nvram
          with major number 10 and minor number 144 using mknod ("man mknod"),


@@ -725,9 +785,16 @@ config NVRAM
          To compile this driver as a module, choose M here: the
          module will be called nvram.
 
          To compile this driver as a module, choose M here: the
          module will be called nvram.
 

+#
+# These legacy RTC drivers just cause too many conflicts with the generic
+# RTC framework ... let's not even try to coexist any more.
+#
+if RTC_LIB=n
+

 config RTC
 config RTC

-       tristate "Enhanced Real Time Clock Support"
-       depends on !PPC && !PARISC && !IA64 && !M68K && !SPARC && !FRV && !ARM && !SUPERH && !S390
+       tristate "Enhanced Real Time Clock Support (legacy PC RTC driver)"
+       depends on !PPC && !PARISC && !IA64 && !M68K && !SPARC && !FRV \
+                       && !ARM && !SUPERH && !S390 && !AVR32 && !BLACKFIN

        ---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
        ---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


@@ -773,31 +840,9 @@ config JS_RTC
          To compile this driver as a module, choose M here: the
          module will be called js-rtc.
 
          To compile this driver as a module, choose M here: the
          module will be called js-rtc.
 

-config SGI_DS1286
-       tristate "SGI DS1286 RTC support"
-       depends on SGI_IP22
-       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 built into your computer.
-         Every SGI has such a clock built in. It reports status information
-         via the file /proc/rtc and its behaviour is set by various ioctls on
-         /dev/rtc.
-
-config SGI_IP27_RTC
-       bool "SGI M48T35 RTC support"
-       depends on SGI_IP27
-       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 built into your computer.
-         Every SGI has such a clock built in. It reports status information
-         via the file /proc/rtc and its behaviour is set by various ioctls on
-         /dev/rtc.
-

 config GEN_RTC
        tristate "Generic /dev/rtc emulation"
 config GEN_RTC
        tristate "Generic /dev/rtc emulation"

-       depends on RTC!=y && !IA64 && !ARM && !M32R && !MIPS && !SPARC && !FRV && !S390 && !SUPERH
+       depends on RTC!=y && !IA64 && !ARM && !M32R && !MIPS && !SPARC && !FRV && !S390 && !SUPERH && !AVR32 && !BLACKFIN

        ---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
        ---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


@@ -833,12 +878,7 @@ config DS1302
          will get access to the real time clock (or hardware clock) built
          into your computer.
 
          will get access to the real time clock (or hardware clock) built
          into your computer.
 

-config COBALT_LCD
-       bool "Support for Cobalt LCD"
-       depends on MIPS_COBALT
-       help
-         This option enables support for the LCD display and buttons found
-         on Cobalt systems through a misc device.
+endif # RTC_LIB

 
 config DTLK
        tristate "Double Talk PC internal speech card support"
 
 config DTLK
        tristate "Double Talk PC internal speech card support"


@@ -851,6 +891,16 @@ config DTLK
          To compile this driver as a module, choose M here: the
          module will be called dtlk.
 
          To compile this driver as a module, choose M here: the
          module will be called dtlk.
 

+config XILINX_HWICAP
+       tristate "Xilinx HWICAP Support"
+       depends on XILINX_VIRTEX || MICROBLAZE
+       help
+         This option enables support for Xilinx Internal Configuration
+         Access Port (ICAP) driver.  The ICAP is used on Xilinx Virtex
+         FPGA platforms to partially reconfigure the FPGA at runtime.
+
+         If unsure, say N.
+

 config R3964
        tristate "Siemens R3964 line discipline"
        ---help---
 config R3964
        tristate "Siemens R3964 line discipline"
        ---help---


@@ -886,7 +936,7 @@ config SONYPI
          Device which can be found in many (all ?) Sony Vaio laptops.
 
          If you have one of those laptops, read
          Device which can be found in many (all ?) Sony Vaio laptops.
 
          If you have one of those laptops, read

-         <file:Documentation/sonypi.txt>, and say Y or M here.
+         <file:Documentation/laptops/sonypi.txt>, and say Y or M here.

 
          To compile this driver as a module, choose M here: the
          module will be called sonypi.
 
          To compile this driver as a module, choose M here: the
          module will be called sonypi.


@@ -896,10 +946,6 @@ config GPIO_TB0219
        depends on TANBAC_TB022X
        select GPIO_VR41XX
 
        depends on TANBAC_TB022X
        select GPIO_VR41XX
 

-source "drivers/char/agp/Kconfig"
-
-source "drivers/char/drm/Kconfig"
-

 source "drivers/char/pcmcia/Kconfig"
 
 config MWAVE
 source "drivers/char/pcmcia/Kconfig"
 
 config MWAVE


@@ -970,10 +1016,6 @@ config CS5535_GPIO
 
          If compiled as a module, it will be called cs5535_gpio.
 
 
          If compiled as a module, it will be called cs5535_gpio.
 

-config GPIO_VR41XX
-       tristate "NEC VR4100 series General-purpose I/O Unit support"
-       depends on CPU_VR41XX
-

 config RAW_DRIVER
        tristate "RAW driver (/dev/raw/rawN)"
        depends on BLOCK
 config RAW_DRIVER
        tristate "RAW driver (/dev/raw/rawN)"
        depends on BLOCK


@@ -1003,15 +1045,6 @@ config HPET
          open selects one of the timers supported by the HPET.  The timers are
          non-periodic and/or periodic.
 
          open selects one of the timers supported by the HPET.  The timers are
          non-periodic and/or periodic.
 

-config HPET_RTC_IRQ
-       bool "HPET Control RTC IRQ" if !HPET_EMULATE_RTC
-       default n
-       depends on HPET
-       help
-         If you say Y here, you will disable RTC_IRQ in drivers/char/rtc.c. It
-         is assumed the platform called hpet_alloc with the RTC IRQ values for
-         the HPET timers.
-

 config HPET_MMAP
        bool "Allow mmap of HPET"
        default y
 config HPET_MMAP
        bool "Allow mmap of HPET"
        default y


@@ -1041,6 +1074,14 @@ config MMTIMER
          The mmtimer device allows direct userspace access to the
          Altix system timer.
 
          The mmtimer device allows direct userspace access to the
          Altix system timer.
 

+config UV_MMTIMER
+       tristate "UV_MMTIMER Memory mapped RTC for SGI UV"
+       depends on X86_UV
+       default m
+       help
+         The uv_mmtimer device allows direct userspace access to the
+         UV system timer.
+

 source "drivers/char/tpm/Kconfig"
 
 config TELCLOCK
 source "drivers/char/tpm/Kconfig"
 
 config TELCLOCK