diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-05-03 14:24:48 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-05-03 14:24:48 +0100 |
| commit | 8417d689429075fe59d92af4036e25424b13ea9c (patch) | |
| tree | f0d341e6eae1cd5c4ca6180aeb29a00e21ff8a8e /drivers/video/Kconfig | |
| parent | 83e4a8b0fe64a97fc92f436c7eff09569352c5ed (diff) | |
| parent | cee7bd6c72b15e357eb375a178532851c72e789c (diff) | |
Merge branch 'tracking-armlt-arm64' into integration-linux-vexpresstracking-integration-linux-vexpress-lsk-20130505.0
Conflicts:
drivers/clk/versatile/Makefile
Diffstat (limited to 'drivers/video/Kconfig')
| -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 59a7330fd18..e08a8507dd7 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -341,7 +341,7 @@ config FB_PM2_FIFO_DISCONNECT config FB_ARMCLCD tristate "ARM PrimeCell PL110 support" - depends on FB && ARM && ARM_AMBA + depends on FB && (ARM || ARM64) && ARM_AMBA select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT |