Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 69474
b: refs/heads/master
c: ec6b148
h: refs/heads/master
v: v3
  • Loading branch information
Mariusz Kozlowski authored and Russell King committed Oct 12, 2007
1 parent 03d2f7d commit ea1f27d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1a10497cfb3ea79bed1470683d4ec5c189febaa6
refs/heads/master: ec6b1482265ec8430fc38c79205567c3601d8901
4 changes: 2 additions & 2 deletions trunk/include/asm-arm/arch-sa1100/SA-1101.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit ea1f27d

Please sign in to comment.