Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

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

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 7ccf871d3c9dd77178fa9ca46fb3e5def6c33a0e..970f70d498f4c814e1cf3362e33d7e23ac53c299 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -138,7 +138,7 @@ config CYZ_INTR
 
 config DIGIEPCA
        tristate "Digiboard Intelligent Async Support"
-       depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
+       depends on SERIAL_NONSTANDARD
        ---help---
          This is a driver for Digi International's Xx, Xeve, and Xem series
          of cards which provide multiple serial ports. You would need
@@ -661,7 +661,7 @@ config HW_RANDOM
 
 config NVRAM
        tristate "/dev/nvram support"
-       depends on ATARI || X86 || X86_64 || ARM || GENERIC_NVRAM
+       depends on ATARI || X86 || ARM || 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"),
@@ -735,7 +735,7 @@ config SGI_IP27_RTC
 
 config GEN_RTC
        tristate "Generic /dev/rtc emulation"
-       depends on RTC!=y && !IA64 && !ARM
+       depends on RTC!=y && !IA64 && !ARM && !M32R && !SPARC32 && !SPARC64
        ---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
@@ -842,8 +842,7 @@ config SONYPI
 
 config TANBAC_TB0219
        tristate "TANBAC TB0219 base board support"
-       depends TANBAC_TB0229
-
+       depends TANBAC_TB022X
 
 menu "Ftape, the floppy tape device driver"
 
@@ -940,8 +939,8 @@ config RAW_DRIVER
          Once bound, I/O against /dev/raw/rawN uses efficient zero-copy I/O. 
          See the raw(8) manpage for more details.
 
-          The raw driver is deprecated and may be removed from 2.7
-          kernels.  Applications should simply open the device (eg /dev/hda1)
+          The raw driver is deprecated and will be removed soon.
+          Applications should simply open the device (eg /dev/hda1)
           with the O_DIRECT flag.
 
 config HPET
@@ -986,7 +985,7 @@ config MAX_RAW_DEVS
 
 config HANGCHECK_TIMER
        tristate "Hangcheck timer"
-       depends on X86_64 || X86 || IA64 || PPC64 || ARCH_S390
+       depends on X86 || IA64 || PPC64 || ARCH_S390
        help
          The hangcheck-timer module detects when the system has gone
          out to lunch past a certain margin.  It can reboot the system
@@ -1002,5 +1001,17 @@ config MMTIMER
 
 source "drivers/char/tpm/Kconfig"
 
+config TELCLOCK
+       tristate "Telecom clock driver for MPBL0010 ATCA SBC"
+       depends on EXPERIMENTAL
+       default n
+       help
+         The telecom clock device is specific to the MPBL0010 ATCA computer and
+         allows direct userspace access to the configuration of the telecom clock
+         configuration settings.  This device is used for hardware synchronization
+         across the ATCA backplane fabric.  Upon loading, the driver exports a
+         sysfs directory, /sys/devices/platform/telco_clock, with a number of
+         files for controlling the behavior of this hardware.
+
 endmenu