diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-27 07:39:43 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-27 07:39:43 -0500 |
| commit | 31bccbf39208133415000520c79ebe7b291786df (patch) | |
| tree | e03b799594ec22613ca2eb7382fc0a98e0cd4b0f /drivers/video | |
| parent | e902be56cbf2a48d96d11d6884767e638d41c712 (diff) | |
| parent | 635f0258e5ae526034486b4ae9020e64bfb7d27e (diff) | |
Merge branch 'clps7500' into devel
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 3f3ce13fef43..237301849075 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 |