diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-08-29 13:14:30 +0400 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-08-29 13:14:30 +0400 |
| commit | d4a7dbfdf180a656de3eb9e64614e2b991ffaa53 (patch) | |
| tree | f7d0d548004751aea77f63e6fd695faf0785bde0 /drivers/video/Kconfig | |
| parent | b5480ed72e4f299c53d1857faaf4f492650ccc43 (diff) | |
| parent | fa514fbc57419505d0e9423dbb8742f2775f882e (diff) | |
| download | linux-d4a7dbfdf180a656de3eb9e64614e2b991ffaa53.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x into fbdev-next
Conflicts:
drivers/video/atmel_lcdfb.c
Diffstat (limited to 'drivers/video/Kconfig')
| -rw-r--r-- | drivers/video/Kconfig | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 963b8b767b83..903ace58fec5 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -259,6 +259,15 @@ config FB_TILEBLITTING comment "Frame buffer hardware drivers" depends on FB +config FB_GRVGA + tristate "Aeroflex Gaisler framebuffer support" + depends on FB && SPARC + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + ---help--- + This enables support for the SVGACTRL framebuffer in the GRLIB IP library from Aeroflex Gaisler. + config FB_CIRRUS tristate "Cirrus Logic support" depends on FB && (ZORRO || PCI) @@ -1756,9 +1765,10 @@ config FB_AU1100 config FB_AU1200 bool "Au1200 LCD Driver" depends on (FB = y) && MIPS && SOC_AU1200 - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT + select FB_SYS_FILLRECT + select FB_SYS_COPYAREA + select FB_SYS_IMAGEBLIT + select FB_SYS_FOPS help This is the framebuffer driver for the AMD Au1200 SOC. It can drive various panels and CRTs by passing in kernel cmd line option |