diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-17 01:28:04 +0300 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-17 01:28:04 +0300 |
| commit | 3879f5d6f03b66626af014cbb6071ad4d79b1c42 (patch) | |
| tree | 018c183306253f12c1d9da739a78d41be71e1cb3 /drivers/video/Kconfig | |
| parent | 607b067e161185d5c441aa366ff9fccd4fd676cb (diff) | |
| parent | 6e1588cbd88590273300403648aef70e6bdaf5af (diff) | |
| download | linux-3879f5d6f03b66626af014cbb6071ad4d79b1c42.tar.xz | |
Merge branch 'imx-fb-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx into devel
Conflicts:
drivers/video/mx3fb.c
Diffstat (limited to 'drivers/video/Kconfig')
| -rw-r--r-- | drivers/video/Kconfig | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 330204a61ea8..41c27a44bd82 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -2120,16 +2120,16 @@ config FB_PRE_INIT_FB the bootloader. config FB_MX3 - tristate "MX3 Framebuffer support" - depends on FB && MX3_IPU - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT - default y - help - This is a framebuffer device for the i.MX31 LCD Controller. So - far only synchronous displays are supported. If you plan to use - an LCD display with your i.MX31 system, say Y here. + tristate "MX3 Framebuffer support" + depends on FB && MX3_IPU + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + default y + help + This is a framebuffer device for the i.MX31 LCD Controller. So + far only synchronous displays are supported. If you plan to use + an LCD display with your i.MX31 system, say Y here. config FB_BROADSHEET tristate "E-Ink Broadsheet/Epson S1D13521 controller support" |