summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2015-02-10 10:42:22 -0500
committerTom Rini <trini@ti.com>2015-02-10 10:42:22 -0500
commitc956662cc3e2475b451afa9a8b639c0ccc49d432 (patch)
tree3e799e9dded7ba103544de55d6d54c6c5f98b6da /drivers/video
parent0dac731d1932027f4f813ec7aede35d5e30dec0e (diff)
parent657006a1c46f11784757f9437ffaaa5e0c4dea72 (diff)
downloadtalos-obmc-uboot-c956662cc3e2475b451afa9a8b639c0ccc49d432.tar.gz
talos-obmc-uboot-c956662cc3e2475b451afa9a8b639c0ccc49d432.zip
Merge branch 'master' of git://git.denx.de/u-boot-atmel
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/atmel_lcdfb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index 5add1369ef..4ed3a49bec 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -21,7 +21,7 @@
#define ATMEL_LCDC_GUARD_TIME 1
#endif
-#if defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91CAP9)
+#if defined(CONFIG_AT91SAM9263)
#define ATMEL_LCDC_FIFO_SIZE 2048
#else
#define ATMEL_LCDC_FIFO_SIZE 512
OpenPOWER on IntegriCloud