diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-11-20 12:51:21 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-11-20 12:51:21 -0500 |
| commit | ef1a68848a968f7347cf7eea24072464059af8f1 (patch) | |
| tree | ba249a734bacd59c1129aa7bde167a8702c7f2b4 /drivers | |
| parent | 1508c99506b5d57b8892a5d759176000c88c93b6 (diff) | |
| parent | 0912e5359f89f303f53fd4874dadab77a4949a8a (diff) | |
Merge branch 'for-rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable
Conflicts:
arch/arm/mach-at91/Kconfig
Diffstat (limited to 'drivers')
| -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 188e1ba3b69f..6b89eb55ed32 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
| @@ -5,6 +5,9 @@ | |||
| 5 | menu "Graphics support" | 5 | menu "Graphics support" |
| 6 | depends on HAS_IOMEM | 6 | depends on HAS_IOMEM |
| 7 | 7 | ||
| 8 | config HAVE_FB_ATMEL | ||
| 9 | bool | ||
| 10 | |||
| 8 | source "drivers/char/agp/Kconfig" | 11 | source "drivers/char/agp/Kconfig" |
| 9 | 12 | ||
| 10 | source "drivers/gpu/vga/Kconfig" | 13 | source "drivers/gpu/vga/Kconfig" |
| @@ -937,7 +940,7 @@ config FB_S1D13XXX | |||
| 937 | 940 | ||
| 938 | config FB_ATMEL | 941 | config FB_ATMEL |
| 939 | tristate "AT91/AT32 LCD Controller support" | 942 | tristate "AT91/AT32 LCD Controller support" |
| 940 | depends on FB && (ARCH_AT91SAM9261 || ARCH_AT91SAM9G10 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G45 || ARCH_AT91CAP9 || AVR32) | 943 | depends on FB && HAVE_FB_ATMEL |
| 941 | select FB_CFB_FILLRECT | 944 | select FB_CFB_FILLRECT |
| 942 | select FB_CFB_COPYAREA | 945 | select FB_CFB_COPYAREA |
| 943 | select FB_CFB_IMAGEBLIT | 946 | select FB_CFB_IMAGEBLIT |