diff options
| author | Russell King | 2009-11-20 18:51:21 +0100 |
|---|---|---|
| committer | Russell King | 2009-11-20 18:51:21 +0100 |
| commit | ef1a68848a968f7347cf7eea24072464059af8f1 (patch) | |
| tree | ba249a734bacd59c1129aa7bde167a8702c7f2b4 /drivers/video | |
| parent | ARM: PNX4008: fix watchdog device driver name (diff) | |
| parent | atmel_lcdfb Kconfig: remove long dependency line (diff) | |
| download | kernel-qcow2-linux-ef1a68848a968f7347cf7eea24072464059af8f1.tar.gz kernel-qcow2-linux-ef1a68848a968f7347cf7eea24072464059af8f1.tar.xz kernel-qcow2-linux-ef1a68848a968f7347cf7eea24072464059af8f1.zip | |
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/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 188e1ba3b69f..6b89eb55ed32 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -5,6 +5,9 @@ menu "Graphics support" depends on HAS_IOMEM +config HAVE_FB_ATMEL + bool + source "drivers/char/agp/Kconfig" source "drivers/gpu/vga/Kconfig" @@ -937,7 +940,7 @@ config FB_S1D13XXX config FB_ATMEL tristate "AT91/AT32 LCD Controller support" - depends on FB && (ARCH_AT91SAM9261 || ARCH_AT91SAM9G10 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G45 || ARCH_AT91CAP9 || AVR32) + depends on FB && HAVE_FB_ATMEL select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT |