diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-30 20:36:49 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-30 20:36:49 -0500 |
| commit | 14a3c4ab0e58d143c7928c9eb2f2610205e13bf2 (patch) | |
| tree | 885992999d7a1a2fd3586efcf32ebcbcbc3a72aa /drivers/video/Kconfig | |
| parent | 1af237a099a3b8ff56aa384f605c6a68af7bf288 (diff) | |
| parent | 47992cbdaef2f18a47871b2ed01ad27f568c8b73 (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: (407 commits)
[ARM] pxafb: add support for overlay1 and overlay2 as framebuffer devices
[ARM] pxafb: cleanup of the timing checking code
[ARM] pxafb: cleanup of the color format manipulation code
[ARM] pxafb: add palette format support for LCCR4_PAL_FOR_3
[ARM] pxafb: add support for FBIOPAN_DISPLAY by dma braching
[ARM] pxafb: allow pxafb_set_par() to start from arbitrary yoffset
[ARM] pxafb: allow video memory size to be configurable
[ARM] pxa: add document on the MFP design and how to use it
[ARM] sa1100_wdt: don't assume CLOCK_TICK_RATE to be a constant
[ARM] rtc-sa1100: don't assume CLOCK_TICK_RATE to be a constant
[ARM] pxa/tavorevb: update board support (smartpanel LCD + keypad)
[ARM] pxa: Update eseries defconfig
[ARM] 5352/1: add w90p910-plat config file
[ARM] s3c: S3C options should depend on PLAT_S3C
[ARM] mv78xx0: implement GPIO and GPIO interrupt support
[ARM] Kirkwood: implement GPIO and GPIO interrupt support
[ARM] Orion: share GPIO IRQ handling code
[ARM] Orion: share GPIO handling code
[ARM] s3c: define __io using the typesafe version
[ARM] S3C64XX: Ensure CPU_V6 is selected
...
Diffstat (limited to 'drivers/video/Kconfig')
| -rw-r--r-- | drivers/video/Kconfig | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index d0c821992a99..6372f8b17b45 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
| @@ -362,7 +362,7 @@ endchoice | |||
| 362 | 362 | ||
| 363 | config FB_ACORN | 363 | config FB_ACORN |
| 364 | bool "Acorn VIDC support" | 364 | bool "Acorn VIDC support" |
| 365 | depends on (FB = y) && ARM && (ARCH_ACORN || ARCH_CLPS7500) | 365 | depends on (FB = y) && ARM && ARCH_ACORN |
| 366 | select FB_CFB_FILLRECT | 366 | select FB_CFB_FILLRECT |
| 367 | select FB_CFB_COPYAREA | 367 | select FB_CFB_COPYAREA |
| 368 | select FB_CFB_IMAGEBLIT | 368 | select FB_CFB_IMAGEBLIT |
| @@ -1817,6 +1817,11 @@ config FB_PXA | |||
| 1817 | 1817 | ||
| 1818 | If unsure, say N. | 1818 | If unsure, say N. |
| 1819 | 1819 | ||
| 1820 | config FB_PXA_OVERLAY | ||
| 1821 | bool "Support PXA27x/PXA3xx Overlay(s) as framebuffer" | ||
| 1822 | default n | ||
| 1823 | depends on FB_PXA && (PXA27x || PXA3xx) | ||
| 1824 | |||
| 1820 | config FB_PXA_SMARTPANEL | 1825 | config FB_PXA_SMARTPANEL |
| 1821 | bool "PXA Smartpanel LCD support" | 1826 | bool "PXA Smartpanel LCD support" |
| 1822 | default n | 1827 | default n |