diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-20 12:49:54 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-20 12:49:54 -0500 |
| commit | 7aeb3be341cc7f1fbf2b98fbef980a816736fe8e (patch) | |
| tree | 38be8872bfd928fd128e64a8ea9754effb0c7220 /drivers/video/omap/Kconfig | |
| parent | 07058599b486fe342f371200ac4718fedbe9a354 (diff) | |
| parent | e13416ae7f378f9963ceca596ac464d4120093f3 (diff) | |
Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6
* 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6:
OMAP: OMAPFB: disable old omapfb for OMAP4 builds
OMAP: DSS: VRAM: Align start & size of vram to 2M
Diffstat (limited to 'drivers/video/omap/Kconfig')
| -rw-r--r-- | drivers/video/omap/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/omap/Kconfig b/drivers/video/omap/Kconfig index 455c6055325d..083c8fe53e24 100644 --- a/drivers/video/omap/Kconfig +++ b/drivers/video/omap/Kconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | config FB_OMAP | 1 | config FB_OMAP |
| 2 | tristate "OMAP frame buffer support (EXPERIMENTAL)" | 2 | tristate "OMAP frame buffer support (EXPERIMENTAL)" |
| 3 | depends on FB && ARCH_OMAP && (OMAP2_DSS = "n") | 3 | depends on FB && (OMAP2_DSS = "n") |
| 4 | 4 | depends on ARCH_OMAP1 || ARCH_OMAP2 || ARCH_OMAP3 | |
| 5 | select FB_CFB_FILLRECT | 5 | select FB_CFB_FILLRECT |
| 6 | select FB_CFB_COPYAREA | 6 | select FB_CFB_COPYAREA |
| 7 | select FB_CFB_IMAGEBLIT | 7 | select FB_CFB_IMAGEBLIT |