diff options
| author | James Morris <jmorris@namei.org> | 2009-03-23 19:52:46 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-23 19:52:46 -0400 |
| commit | 703a3cd72817e99201cef84a8a7aecc60b2b3581 (patch) | |
| tree | 3e943755178ff410694722bb031f523136fbc432 /drivers/mtd/devices/Kconfig | |
| parent | df7f54c012b92ec93d56b68547351dcdf8a163d3 (diff) | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
Merge branch 'master' into next
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 |