diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-14 06:00:16 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-14 06:00:16 -0400 |
commit | 4c31791c3d9d38ac052dd5e2981df713d8f3dcc4 (patch) | |
tree | b7f95922b2f1da5b36d95176e6d8f826151f3ee1 /drivers/video/Kconfig | |
parent | 98797a241e28b787b84d308b867ec4c5fe7bbdf8 (diff) | |
parent | 7517b3fbe40c231d79d36f31c1e9930cbb8c4be2 (diff) |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
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 8083d862ebc5..b6c0239d8d29 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
@@ -1759,6 +1759,16 @@ config FB_68328 | |||
1759 | Say Y here if you want to support the built-in frame buffer of | 1759 | Say Y here if you want to support the built-in frame buffer of |
1760 | the Motorola 68328 CPU family. | 1760 | the Motorola 68328 CPU family. |
1761 | 1761 | ||
1762 | config FB_PXA168 | ||
1763 | tristate "PXA168/910 LCD framebuffer support" | ||
1764 | depends on FB && (CPU_PXA168 || CPU_PXA910) | ||
1765 | select FB_CFB_FILLRECT | ||
1766 | select FB_CFB_COPYAREA | ||
1767 | select FB_CFB_IMAGEBLIT | ||
1768 | ---help--- | ||
1769 | Frame buffer driver for the built-in LCD controller in the Marvell | ||
1770 | MMP processor. | ||
1771 | |||
1762 | config FB_PXA | 1772 | config FB_PXA |
1763 | tristate "PXA LCD framebuffer support" | 1773 | tristate "PXA LCD framebuffer support" |
1764 | depends on FB && ARCH_PXA | 1774 | depends on FB && ARCH_PXA |