diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-06 19:50:35 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-06 19:50:35 -0500 |
commit | 3c0cb7c31c206aaedb967e44b98442bbeb17a6c4 (patch) | |
tree | 3ecba45d7ffae4fba4a5aafaef4af5b0b1105bde /drivers/video/Kconfig | |
parent | f70f5b9dc74ca7d0a64c4ead3fb28da09dc1b234 (diff) | |
parent | 404a02cbd2ae8bf256a2fa1169bdfe86bb5ebb34 (diff) |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (416 commits)
ARM: DMA: add support for DMA debugging
ARM: PL011: add DMA burst threshold support for ST variants
ARM: PL011: Add support for transmit DMA
ARM: PL011: Ensure IRQs are disabled in UART interrupt handler
ARM: PL011: Separate hardware FIFO size from TTY FIFO size
ARM: PL011: Allow better handling of vendor data
ARM: PL011: Ensure error flags are clear at startup
ARM: PL011: include revision number in boot-time port printk
ARM: vexpress: add sched_clock() for Versatile Express
ARM i.MX53: Make MX53 EVK bootable
ARM i.MX53: Some bug fix about MX53 MSL code
ARM: 6607/1: sa1100: Update platform device registration
ARM: 6606/1: sa1100: Fix platform device registration
ARM i.MX51: rename IPU irqs
ARM i.MX51: Add ipu clock support
ARM: imx/mx27_3ds: Add PMIC support
ARM: DMA: Replace page_to_dma()/dma_to_page() with pfn_to_dma()/dma_to_pfn()
mx51: fix usb clock support
MX51: Add support for usb host 2
arch/arm/plat-mxc/ehci.c: fix errors/typos
...
Diffstat (limited to 'drivers/video/Kconfig')
-rw-r--r-- | drivers/video/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 9f36a29b10b4..55dc6fb6e909 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
@@ -1932,6 +1932,16 @@ config FB_PXA_PARAMETERS | |||
1932 | 1932 | ||
1933 | <file:Documentation/fb/pxafb.txt> describes the available parameters. | 1933 | <file:Documentation/fb/pxafb.txt> describes the available parameters. |
1934 | 1934 | ||
1935 | config PXA3XX_GCU | ||
1936 | tristate "PXA3xx 2D graphics accelerator driver" | ||
1937 | depends on FB_PXA | ||
1938 | help | ||
1939 | Kernelspace driver for the 2D graphics controller unit (GCU) | ||
1940 | found on PXA3xx processors. There is a counterpart driver in the | ||
1941 | DirectFB suite, see http://www.directfb.org/ | ||
1942 | |||
1943 | If you compile this as a module, it will be called pxa3xx_gcu. | ||
1944 | |||
1935 | config FB_MBX | 1945 | config FB_MBX |
1936 | tristate "2700G LCD framebuffer support" | 1946 | tristate "2700G LCD framebuffer support" |
1937 | depends on FB && ARCH_PXA | 1947 | depends on FB && ARCH_PXA |