diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 18:29:32 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 18:29:32 -0500 |
| commit | b93a4afcff7be859e30cad2a305731516057d6cf (patch) | |
| tree | fb5fe55864e16527e453efd18790a34db22ee2a1 /drivers/video | |
| parent | 62c132a8008991530839401674ce8e1b12b005d3 (diff) | |
| parent | 9b1489e989695c4d502865f8bec616c0f17e99ab (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Conflicts:
arch/arm/Makefile
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/Kconfig | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 5a5c303a6373..83d40ed2f2d6 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
| @@ -400,9 +400,12 @@ config FB_SA1100 | |||
| 400 | If you plan to use the LCD display with your SA-1100 system, say | 400 | If you plan to use the LCD display with your SA-1100 system, say |
| 401 | Y here. | 401 | Y here. |
| 402 | 402 | ||
| 403 | config HAVE_FB_IMX | ||
| 404 | bool | ||
| 405 | |||
| 403 | config FB_IMX | 406 | config FB_IMX |
| 404 | tristate "Motorola i.MX LCD support" | 407 | tristate "Motorola i.MX LCD support" |
| 405 | depends on FB && (ARCH_MX1 || ARCH_MX2) | 408 | depends on FB && (HAVE_FB_IMX || ARCH_MX1 || ARCH_MX2) |
| 406 | select FB_CFB_FILLRECT | 409 | select FB_CFB_FILLRECT |
| 407 | select FB_CFB_COPYAREA | 410 | select FB_CFB_COPYAREA |
| 408 | select FB_CFB_IMAGEBLIT | 411 | select FB_CFB_IMAGEBLIT |