diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-23 22:38:30 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-23 22:38:30 -0400 |
| commit | 9e41d9597e7825ec20d690013d32bcec5f3fe16a (patch) | |
| tree | ac6fea59e9a4a1c2183d6bbd6ffa760680673afb /arch/powerpc/platforms/ps3 | |
| parent | 77ecfe8d427f554fabbf258e9d789f1d4c3afd63 (diff) | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'arch/powerpc/platforms/ps3')
| -rw-r--r-- | arch/powerpc/platforms/ps3/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/ps3/Kconfig b/arch/powerpc/platforms/ps3/Kconfig index 204ae5c402f..dfe316b161a 100644 --- a/arch/powerpc/platforms/ps3/Kconfig +++ b/arch/powerpc/platforms/ps3/Kconfig | |||
| @@ -128,6 +128,13 @@ config PS3_FLASH | |||
| 128 | be disabled on the kernel command line using "ps3flash=off", to | 128 | be disabled on the kernel command line using "ps3flash=off", to |
| 129 | not allocate this fixed buffer. | 129 | not allocate this fixed buffer. |
| 130 | 130 | ||
| 131 | config PS3_VRAM | ||
| 132 | tristate "PS3 Video RAM Storage Driver" | ||
| 133 | depends on FB_PS3=y && BLOCK && m | ||
| 134 | help | ||
| 135 | This driver allows you to use excess PS3 video RAM as volatile | ||
| 136 | storage or system swap. | ||
| 137 | |||
| 131 | config PS3_LPM | 138 | config PS3_LPM |
| 132 | tristate "PS3 Logical Performance Monitor support" | 139 | tristate "PS3 Logical Performance Monitor support" |
| 133 | depends on PPC_PS3 | 140 | depends on PPC_PS3 |