Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 83576
b: refs/heads/master
c: 7974f72
h: refs/heads/master
v: v3
  • Loading branch information
Geert Uytterhoeven authored and Linus Torvalds committed Feb 6, 2008
1 parent 224ae45 commit f8e30cf
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 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: 9f4f21b453f2f51c9d1f22638eae306c07c95b42
refs/heads/master: 7974f72a21a246051b3dd84d7158974fc4785150
9 changes: 4 additions & 5 deletions trunk/drivers/video/ps3fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,9 @@ struct ps3fb_par {
unsigned int ddr_line_length;
unsigned int ddr_frame_size;
unsigned int xdr_frame_size;
unsigned long full_offset; /* start of fullscreen DDR fb */
unsigned long fb_offset; /* start of actual DDR fb */
unsigned long pan_offset;
unsigned int full_offset; /* start of fullscreen DDR fb */
unsigned int fb_offset; /* start of actual DDR fb */
unsigned int pan_offset;
};


Expand Down Expand Up @@ -512,8 +512,7 @@ static int ps3fb_set_par(struct fb_info *info)
{
struct ps3fb_par *par = info->par;
unsigned int mode, ddr_line_length, xdr_line_length, lines, maxlines;
unsigned int ddr_xoff, ddr_yoff;
unsigned long offset;
unsigned int ddr_xoff, ddr_yoff, offset;
const struct fb_videomode *vmode;
u64 dst;

Expand Down

0 comments on commit f8e30cf

Please sign in to comment.