Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 43812
b: refs/heads/master
c: 9b9817c
h: refs/heads/master
v: v3
  • Loading branch information
Ville Syrjala authored and Linus Torvalds committed Dec 8, 2006
1 parent 9ff439a commit 26763d1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: c98959f566e0c695b1b237ad8e0f8f825d31fa71
refs/heads/master: 9b9817cc70709e10ffa9b27af35b2e8f1ef84798
6 changes: 3 additions & 3 deletions trunk/drivers/video/aty/atyfb.h
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ static inline u32 aty_ld_le32(int regindex, const struct atyfb_par *par)
regindex -= 0x800;

#ifdef CONFIG_ATARI
return in_le32((volatile u32 *)(par->ati_regbase + regindex));
return in_le32(par->ati_regbase + regindex);
#else
return readl(par->ati_regbase + regindex);
#endif
Expand All @@ -240,7 +240,7 @@ static inline void aty_st_le32(int regindex, u32 val, const struct atyfb_par *pa
regindex -= 0x800;

#ifdef CONFIG_ATARI
out_le32((volatile u32 *)(par->ati_regbase + regindex), val);
out_le32(par->ati_regbase + regindex, val);
#else
writel(val, par->ati_regbase + regindex);
#endif
Expand All @@ -253,7 +253,7 @@ static inline void aty_st_le16(int regindex, u16 val,
if (regindex >= 0x400)
regindex -= 0x800;
#ifdef CONFIG_ATARI
out_le16((volatile u16 *)(par->ati_regbase + regindex), val);
out_le16(par->ati_regbase + regindex, val);
#else
writel(val, par->ati_regbase + regindex);
#endif
Expand Down

0 comments on commit 26763d1

Please sign in to comment.