1 files changed, 19 insertions, 1 deletions

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 5980f3e886fc..889cad07774e 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -187,6 +187,7 @@ config MOXA_SMARTIO
 config ISI
         tristate "Multi-Tech multiport card support (EXPERIMENTAL)"
         depends on SERIAL_NONSTANDARD
+        select FW_LOADER
         help
           This is a driver for the Multi-Tech cards which provide several
           serial ports.  The driver is experimental and can currently only be
@@ -560,14 +561,31 @@ config TIPAR
 
           If unsure, say N.
 
+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.
+          It will automatically be selected if one of the back-end console drivers
+          is selected.
+
+
 config HVC_CONSOLE
         bool "pSeries Hypervisor Virtual Console support"
         depends on PPC_PSERIES
+        select HVC_DRIVER
         help
           pSeries machines when partitioned support a hypervisor virtual
           console. This driver allows each pSeries partition to have a console
           which is accessed via the HMC.
 
+config HVC_RTAS
+        bool "IBM RTAS Console support"
+        depends on PPC_RTAS
+        select HVC_DRIVER
+        help
+          IBM Console device driver which makes use of RTAS
+
 config HVCS
         tristate "IBM Hypervisor Virtual Console Server support"
         depends on PPC_PSERIES
@@ -695,7 +713,7 @@ config NVRAM
 
 config RTC
         tristate "Enhanced Real Time Clock Support"
-        depends on !PPC && !PARISC && !IA64 && !M68K && (!SPARC || PCI) && !FRV
+        depends on !PPC && !PARISC && !IA64 && !M68K && (!SPARC || PCI) && !FRV && !ARM
         ---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