Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-nommu

[sfrench/cifs-2.6.git] / drivers / mtd / devices / Kconfig

diff --git a/drivers/mtd/devices/Kconfig b/drivers/mtd/devices/Kconfig
index 6fde0a2e3567d589fb4757a12eb49929b1c6c463..bc33200535fc3857a474892eec8340dbfabfbc64 100644 (file)
--- a/drivers/mtd/devices/Kconfig
+++ b/drivers/mtd/devices/Kconfig
@@ -120,6 +120,13 @@ config MTD_PHRAM
          doesn't have access to, memory beyond the mem=xxx limit, nvram,
          memory on the video card, etc...
 
+config MTD_PS3VRAM
+       tristate "PS3 video RAM"
+       depends on FB_PS3
+       help
+         This driver allows you to use excess PS3 video RAM as volatile
+         storage or system swap.
+
 config MTD_LART
        tristate "28F160xx flash driver for LART"
        depends on SA1100_LART