diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-27 09:57:44 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-27 09:57:44 -0400 |
| commit | 801cffdae716aec1bc101f8722054b865cd67799 (patch) | |
| tree | 2c3411ee1260ff0c53e06ed4ee65019abaf009ca /drivers/video/omap2/omapfb/Kconfig | |
| parent | 1be030ee4c589acb079c578a00686a54942d88fb (diff) | |
| parent | c4202c86cdd53c91744d652ec0e16fd28ff6d6f3 (diff) | |
Merge remote-tracking branch 'tmlind/dss2' into linaro-2.6.38
Conflicts:
arch/arm/mach-omap2/board-overo.c
Diffstat (limited to 'drivers/video/omap2/omapfb/Kconfig')
| -rw-r--r-- | drivers/video/omap2/omapfb/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/omap2/omapfb/Kconfig b/drivers/video/omap2/omapfb/Kconfig index 65149b22cf3..aa33386c81f 100644 --- a/drivers/video/omap2/omapfb/Kconfig +++ b/drivers/video/omap2/omapfb/Kconfig @@ -1,5 +1,5 @@ menuconfig FB_OMAP2 - tristate "OMAP2/3 frame buffer support (EXPERIMENTAL)" + tristate "OMAP2+ frame buffer support (EXPERIMENTAL)" depends on FB && OMAP2_DSS select OMAP2_VRAM @@ -8,10 +8,10 @@ menuconfig FB_OMAP2 select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT help - Frame buffer driver for OMAP2/3 based boards. + Frame buffer driver for OMAP2+ based boards. config FB_OMAP2_DEBUG_SUPPORT - bool "Debug support for OMAP2/3 FB" + bool "Debug support for OMAP2+ FB" default y depends on FB_OMAP2 help |