aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2012-03-20 21:27:08 -0400
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2012-03-21 03:23:06 -0400
commitf363afc168e772a6034ea97b7b213a1b47b8f376 (patch)
treeaa4c20e316fd667a4f3b0ee1c802b97130182313
parent1d45ee333c2c4b1758abbd3e89c32dfd5d56342f (diff)
fbdev: remove dependency of FB_SH_MOBILE_MERAM from FB_SH_MOBILE_LCDC
MERAM can be used for other IP blocks as well in the future. It doesn't necessarily mean that the MERAM driver depends on the LCDC. This patch corrects dependency. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
-rw-r--r--drivers/video/Kconfig25
1 files changed, 12 insertions, 13 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 005347a35b61..86d9c8c884af 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -2013,19 +2013,6 @@ config FB_SH_MOBILE_HDMI
2013 ---help--- 2013 ---help---
2014 Driver for the on-chip SH-Mobile HDMI controller. 2014 Driver for the on-chip SH-Mobile HDMI controller.
2015 2015
2016config FB_SH_MOBILE_MERAM
2017 tristate "SuperH Mobile MERAM read ahead support for LCDC"
2018 depends on FB_SH_MOBILE_LCDC
2019 select GENERIC_ALLOCATOR
2020 default y
2021 ---help---
2022 Enable MERAM support for the SH-Mobile LCD controller.
2023
2024 This will allow for caching of the framebuffer to provide more
2025 reliable access under heavy main memory bus traffic situations.
2026 Up to 4 memory channels can be configured, allowing 4 RGB or
2027 2 YCbCr framebuffers to be configured.
2028
2029config FB_TMIO 2016config FB_TMIO
2030 tristate "Toshiba Mobile IO FrameBuffer support" 2017 tristate "Toshiba Mobile IO FrameBuffer support"
2031 depends on FB && MFD_CORE 2018 depends on FB && MFD_CORE
@@ -2436,4 +2423,16 @@ if FB || SGI_NEWPORT_CONSOLE
2436 source "drivers/video/logo/Kconfig" 2423 source "drivers/video/logo/Kconfig"
2437endif 2424endif
2438 2425
2426config FB_SH_MOBILE_MERAM
2427 tristate "SuperH Mobile MERAM read ahead support"
2428 depends on (SUPERH || ARCH_SHMOBILE)
2429 select GENERIC_ALLOCATOR
2430 ---help---
2431 Enable MERAM support for the SuperH controller.
2432
2433 This will allow for caching of the framebuffer to provide more
2434 reliable access under heavy main memory bus traffic situations.
2435 Up to 4 memory channels can be configured, allowing 4 RGB or
2436 2 YCbCr framebuffers to be configured.
2437
2439endmenu 2438endmenu