Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6] / arch / powerpc / platforms / ps3 / Kconfig

diff --git a/arch/powerpc/platforms/ps3/Kconfig b/arch/powerpc/platforms/ps3/Kconfig
index b5122a76481388f05733b4da4e6950e5e8f745e2..d4fc74f7bb15a09eb6d2f4b357ac574c9def5e7b 100644 (file)
--- a/arch/powerpc/platforms/ps3/Kconfig
+++ b/arch/powerpc/platforms/ps3/Kconfig
@@ -7,6 +7,7 @@ config PPC_PS3
        select USB_OHCI_BIG_ENDIAN_MMIO
        select USB_ARCH_HAS_EHCI
        select USB_EHCI_BIG_ENDIAN_MMIO
+       select MEMORY_HOTPLUG
        help
          This option enables support for the Sony PS3 game console
          and other platforms using the PS3 hypervisor.
@@ -97,4 +98,44 @@ config PS3_SYS_MANAGER
          This support is required for system control.  In
          general, all users will say Y or M.
 
+config PS3_STORAGE
+       depends on PPC_PS3
+       tristate
+
+config PS3_DISK
+       tristate "PS3 Disk Storage Driver"
+       depends on PPC_PS3 && BLOCK
+       select PS3_STORAGE
+       help
+         Include support for the PS3 Disk Storage.
+
+         This support is required to access the PS3 hard disk.
+         In general, all users will say Y or M.
+
+config PS3_ROM
+       tristate "PS3 BD/DVD/CD-ROM Storage Driver"
+       depends on PPC_PS3 && SCSI
+       select PS3_STORAGE
+       help
+         Include support for the PS3 ROM Storage.
+
+         This support is required to access the PS3 BD/DVD/CD-ROM drive.
+         In general, all users will say Y or M.
+         Also make sure to say Y or M to "SCSI CDROM support" later.
+
+config PS3_FLASH
+       tristate "PS3 FLASH ROM Storage Driver"
+       depends on PPC_PS3
+       select PS3_STORAGE
+       help
+         Include support for the PS3 FLASH ROM Storage.
+
+         This support is required to access the PS3 FLASH ROM, which
+         contains the boot loader and some boot options.
+         In general, all users will say Y or M.
+
+         As this driver needs a fixed buffer of 256 KiB of memory, it can
+         be disabled on the kernel command line using "ps3flash=off", to
+         not allocate this fixed buffer.
+
 endmenu