diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-18 12:05:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-18 12:05:40 -0400 |
| commit | d941d0ed6bf274ca267dd4de5861ffd24e1ae8f8 (patch) | |
| tree | 3176a15279e2521d2391c7b2cec6f7b923faa64b /drivers/mtd/devices/Kconfig | |
| parent | 8144737def6abc49457124424887436531bd6a50 (diff) | |
| parent | 9aac397525dc7945b1582a80cef5860516bca452 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/ps3: ps3_defconfig updates
powerpc/mm: Respect _PAGE_COHERENT on classic ppc32 SW
powerpc/5200: Enable CPU_FTR_NEED_COHERENT for MPC52xx
ps3/block: Replace mtd/ps3vram by block/ps3vram
Diffstat (limited to 'drivers/mtd/devices/Kconfig')
| -rw-r--r-- | drivers/mtd/devices/Kconfig | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/mtd/devices/Kconfig b/drivers/mtd/devices/Kconfig index bc33200535fc..6fde0a2e3567 100644 --- a/drivers/mtd/devices/Kconfig +++ b/drivers/mtd/devices/Kconfig | |||
| @@ -120,13 +120,6 @@ config MTD_PHRAM | |||
| 120 | doesn't have access to, memory beyond the mem=xxx limit, nvram, | 120 | doesn't have access to, memory beyond the mem=xxx limit, nvram, |
| 121 | memory on the video card, etc... | 121 | memory on the video card, etc... |
| 122 | 122 | ||
| 123 | config MTD_PS3VRAM | ||
| 124 | tristate "PS3 video RAM" | ||
| 125 | depends on FB_PS3 | ||
| 126 | help | ||
| 127 | This driver allows you to use excess PS3 video RAM as volatile | ||
| 128 | storage or system swap. | ||
| 129 | |||
| 130 | config MTD_LART | 123 | config MTD_LART |
| 131 | tristate "28F160xx flash driver for LART" | 124 | tristate "28F160xx flash driver for LART" |
| 132 | depends on SA1100_LART | 125 | depends on SA1100_LART |