[PATCH] ps3: introduce CONFIG_PS3_ADVANCED

ps3: Introduce CONFIG_PS3_ADVANCED, as suggested by Roman Zippel, and use
it to control questions about PS3 subsystems that may not be obvious for
the casual user.

This gets rid of the following warning on non-powerpc platforms: |
drivers/video/Kconfig:1604:warning: 'select' used by config symbol 'FB_PS3'
refer to undefined symbol 'PS3_PS3AV'

Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Acked-by: Geoff Levand <geoffrey.levand@am.sony.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/powerpc/platforms/ps3/Kconfig b/arch/powerpc/platforms/ps3/Kconfig
index d270a1e374d5981662e788f10dfd9b7f07cd2aac..1a481a60a883db69f33e96a1a35c0b0de09bf19f 100644 (file)
--- a/arch/powerpc/platforms/ps3/Kconfig
+++ b/arch/powerpc/platforms/ps3/Kconfig
@@ -1,9 +1,24 @@
 menu "PS3 Platform Options"
        depends on PPC_PS3
 
+config PS3_ADVANCED
+       depends on PPC_PS3
+       bool "PS3 Advanced configuration options"
+       help
+         This gives you access to some advanced options for the PS3. The
+         defaults should be fine for most users, but these options may make
+         it possible to better control the kernel configuration if you know
+         what you are doing.
+
+         Note that the answer to this question won't directly affect the
+         kernel: saying N will just cause the configurator to skip all
+         the questions about these options.
+
+         Most users should say N to this question.
+
 config PS3_HTAB_SIZE
        depends on PPC_PS3
-       int "PS3 Platform pagetable size"
+       int "PS3 Platform pagetable size" if PS3_ADVANCED
        range 18 20
        default 20
        help
@@ -42,7 +57,7 @@ config PS3_USE_LPAR_ADDR
 
 config PS3_VUART
        depends on PPC_PS3
-       bool "PS3 Virtual UART support"
+       bool "PS3 Virtual UART support" if PS3_ADVANCED
        default y
        help
          Include support for the PS3 Virtual UART.
@@ -52,9 +67,8 @@ config PS3_VUART
          general, all users will say Y.
 
 config PS3_PS3AV
-       tristate "PS3 AV settings driver"
-       depends on PPC_PS3
-       select PS3_VUART
+       tristate "PS3 AV settings driver" if PS3_ADVANCED
+       depends on PS3_VUART
        default y
        help
          Include support for the PS3 AV Settings driver.
@@ -63,8 +77,8 @@ config PS3_PS3AV
          general, all users will say Y or M.
 
 config PS3_SYS_MANAGER
-       bool "PS3 System Manager driver"
-       select PS3_VUART
+       bool "PS3 System Manager driver" if PS3_ADVANCED
+       depends on PS3_VUART
        default y
        help
          Include support for the PS3 System Manager.

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index c1536d78555178b71d54150079eb5818b4e4ec5f..b8f0a11e8f3174c83b02d69229d2d516c251ce4d 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1618,8 +1618,7 @@ config FB_IBM_GXT4500
 
 config FB_PS3
        bool "PS3 GPU framebuffer driver"
-       depends on FB && PPC_PS3
-       select PS3_PS3AV
+       depends on FB && PS3_PS3AV
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT