From ea1f27dd02092e68b457c783020ae407fd6ec383 Mon Sep 17 00:00:00 2001 From: Mariusz Kozlowski Date: Thu, 20 Sep 2007 20:02:22 +0100 Subject: [PATCH] --- yaml --- r: 69474 b: refs/heads/master c: ec6b1482265ec8430fc38c79205567c3601d8901 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-arm/arch-sa1100/SA-1101.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index af3bbe650a70..6231407e6175 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a10497cfb3ea79bed1470683d4ec5c189febaa6 +refs/heads/master: ec6b1482265ec8430fc38c79205567c3601d8901 diff --git a/trunk/include/asm-arm/arch-sa1100/SA-1101.h b/trunk/include/asm-arm/arch-sa1100/SA-1101.h index 527d887f1ee3..65ca8c79e6d2 100644 --- a/trunk/include/asm-arm/arch-sa1100/SA-1101.h +++ b/trunk/include/asm-arm/arch-sa1100/SA-1101.h @@ -106,7 +106,7 @@ #define SMCR_ColAdrBits( x ) /* col. addr bits 8..11 */ \ (( (x) - 8 ) << FShft (SMCR_DCAC)) #define SMCR_RowAdrBits( x ) /* row addr bits 9..12 */\ - (( (x) - 9 ) << FShft (SMCR_DRAC) + (( (x) - 9 ) << FShft (SMCR_DRAC)) #define SNPR_VFBstart Fld(12,0) /* Video frame buffer addr */ #define SNPR_VFBsize Fld(11,12) /* Video frame buffer size */ @@ -394,7 +394,7 @@ #define VgaStatus (*((volatile Word *) SA1101_p2v (_VgaStatus))) #define VgaInterruptMask (*((volatile Word *) SA1101_p2v (_VgaInterruptMask))) #define VgaPalette (*((volatile Word *) SA1101_p2v (_VgaPalette))) -#define DacControl (*((volatile Word *) SA1101_p2v (_DacControl)) +#define DacControl (*((volatile Word *) SA1101_p2v (_DacControl))) #define VgaTest (*((volatile Word *) SA1101_p2v (_VgaTest))) #define VideoControl_VgaEn 0x00000000