From 96813971286eeb989f2c76f2ba0e2b8fea5c9464 Mon Sep 17 00:00:00 2001
From: Nicolas Ferre <nicolas.ferre@atmel.com>
Date: Thu, 28 May 2009 14:34:36 -0700
Subject: [PATCH] --- yaml --- r: 145343 b: refs/heads/master c:
 53b7479bbdaedcc7846c66fd608fe66f1b5aa35b h: refs/heads/master i:   145341:
 8ec2ceeccac8bebbf8d46f33ba59a7f2ddcb25f7   145339:
 ed43e976fcb290b8600d6cfa34df36787b1393fb   145335:
 63df548dcad1b32fe90d341d3e7d54aabe773b0c   145327:
 e83fc28e361c7b5d576582885e4df4062f388579   145311:
 bfdfd7ec970240bcf013d1b30bf5fb47fa053a86   145279:
 c6cdc61242e78e96426a37a77ddbc8e4eb0ba812 v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/video/atmel_lcdfb.c | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 01c492afa138..852857ae8ef9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17663e59704bea838a9236f299104e30909a43b1
+refs/heads/master: 53b7479bbdaedcc7846c66fd608fe66f1b5aa35b
diff --git a/trunk/drivers/video/atmel_lcdfb.c b/trunk/drivers/video/atmel_lcdfb.c
index 9a577a800db5..2fb63f6ea2f1 100644
--- a/trunk/drivers/video/atmel_lcdfb.c
+++ b/trunk/drivers/video/atmel_lcdfb.c
@@ -29,14 +29,8 @@
 
 /* configurable parameters */
 #define ATMEL_LCDC_CVAL_DEFAULT		0xc8
-#define ATMEL_LCDC_DMA_BURST_LEN	8
-
-#if defined(CONFIG_ARCH_AT91SAM9263) || defined(CONFIG_ARCH_AT91CAP9) || \
-	defined(CONFIG_ARCH_AT91SAM9RL)
-#define ATMEL_LCDC_FIFO_SIZE		2048
-#else
-#define ATMEL_LCDC_FIFO_SIZE		512
-#endif
+#define ATMEL_LCDC_DMA_BURST_LEN	8	/* words */
+#define ATMEL_LCDC_FIFO_SIZE		512	/* words */
 
 #if defined(CONFIG_ARCH_AT91)
 #define	ATMEL_LCDFB_FBINFO_DEFAULT	(FBINFO_DEFAULT \