Merge branch 'linux-2.6' into next

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

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 43d6ba83a1912ccbc5f668876e8e6cf7a82a3066..f57907a2c7a134fe078519cabe489f3ae819ca66 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -631,6 +631,12 @@ config HVC_XEN
        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