Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[pandora-kernel.git] / drivers / char / Kconfig

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 43d3395..0f175a8 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -682,6 +682,15 @@ config HVC_UDBG
        select HVC_DRIVER
        default n
 
+config HVC_DCC
+       bool "ARM JTAG DCC console"
+       depends on ARM
+       select HVC_DRIVER
+       help
+         This console uses the JTAG DCC on ARM to create a console under the HVC
+        driver. This console is used through a JTAG only on ARM. If you don't have
+        a JTAG then you probably don't want this option.
+
 config VIRTIO_CONSOLE
        tristate "Virtio console"
        depends on VIRTIO
@@ -1038,15 +1047,6 @@ config NSC_GPIO
          pc8736x_gpio drivers.  If those drivers are built as
          modules, this one will be too, named nsc_gpio
 
-config CS5535_GPIO
-       tristate "AMD CS5535/CS5536 GPIO (Geode Companion Device)"
-       depends on X86_32
-       help
-         Give userspace access to the GPIO pins on the AMD CS5535 and
-         CS5536 Geode companion devices.
-
-         If compiled as a module, it will be called cs5535_gpio.
-
 config RAW_DRIVER
        tristate "RAW driver (/dev/raw/rawN)"
        depends on BLOCK