Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...

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

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index a87b89db08e99dd10cb30b9b2e0f7d72421b6edf..2d854bb9373e46ca465ab36411089f7810944203 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -80,6 +80,15 @@ config VT_HW_CONSOLE_BINDING
         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 SERIAL_NONSTANDARD
        bool "Non-standard serial port support"
        depends on HAS_IOMEM
@@ -109,8 +118,8 @@ config COMPUTONE
          order to become a dial-in server. If you have a card like that, say
          Y here and read <file:Documentation/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"
@@ -187,6 +196,7 @@ config ESPSERIAL
 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.
 
@@ -481,6 +491,34 @@ config BRIQ_PANEL
 
          It's safe to say N here.
 
+config BFIN_OTP
+       tristate "Blackfin On-Chip OTP Memory Support"
+       depends on BLACKFIN && (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
@@ -704,9 +742,16 @@ config 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
-       tristate "Enhanced Real Time Clock Support"
-       depends on !PPC && !PARISC && !IA64 && !M68K && !SPARC && !FRV && !ARM && !SUPERH && !S390 && !AVR32
+       tristate "Enhanced Real Time Clock Support (legacy PC RTC driver)"
+       depends on !PPC && !PARISC && !IA64 && !M68K && !SPARC && !FRV \
+                       && !ARM && !SUPERH && !S390 && !AVR32
        ---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
@@ -812,6 +857,8 @@ config DS1302
          will get access to the real time clock (or hardware clock) built
          into your computer.
 
+endif # RTC_LIB
+
 config COBALT_LCD
        bool "Support for Cobalt LCD"
        depends on MIPS_COBALT
@@ -989,9 +1036,9 @@ config HPET
          non-periodic and/or periodic.
 
 config HPET_RTC_IRQ
-       bool "HPET Control RTC IRQ" if !HPET_EMULATE_RTC
-       default n
-       depends on HPET
+       bool
+       default HPET_EMULATE_RTC
+       depends on RTC && 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