Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-apm

[sfrench/cifs-2.6.git] / arch / powerpc / platforms / ps3 / Kconfig

diff --git a/arch/powerpc/platforms/ps3/Kconfig b/arch/powerpc/platforms/ps3/Kconfig
index 451bfcd5502e537549937f989bc5b99795d1866c..de52ec4e9e586c7d11e088587beddfb669ce4a6e 100644 (file)
--- a/arch/powerpc/platforms/ps3/Kconfig
+++ b/arch/powerpc/platforms/ps3/Kconfig
@@ -40,4 +40,15 @@ config PS3_USE_LPAR_ADDR
 
          If you have any doubt, choose the default y.
 
+config PS3_VUART
+       depends on PPC_PS3
+       bool "PS3 Virtual UART support"
+       default y
+       help
+         Include support for the PS3 Virtual UART.
+
+         This support is required for several system services
+         including the System Manager and AV Settings.  In
+         general, all users will say Y.
+
 endmenu