diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-06-12 17:02:03 +0200 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-06-12 17:02:03 +0200 |
| commit | 82681a318f9f028ea64e61f24bbd9ac535531921 (patch) | |
| tree | 529b6a5b4fd040fb54b7672b1a224ebd47445876 /drivers/video/atmel_lcdfb.c | |
| parent | [SCSI] osd: Remove out-of-tree left overs (diff) | |
| parent | block: fix kernel-doc in recent block/ changes (diff) | |
| download | linux-82681a318f9f028ea64e61f24bbd9ac535531921.tar.xz linux-82681a318f9f028ea64e61f24bbd9ac535531921.zip | |
[SCSI] Merge branch 'linus'
Conflicts:
drivers/message/fusion/mptsas.c
fixed up conflict between req->data_len accessors and mptsas driver updates.
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/video/atmel_lcdfb.c')
| -rw-r--r-- | drivers/video/atmel_lcdfb.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index 9a577a800db5..2fb63f6ea2f1 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/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 \ |