Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 304498
b: refs/heads/master
c: acbaa0b
h: refs/heads/master
v: v3
  • Loading branch information
Javier M. Mellid authored and Greg Kroah-Hartman committed Apr 30, 2012
1 parent 794c5f0 commit 2cbd0de
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: 5c40fb37c7e43db66ba8ecd4499ad5a6c2e734b8
refs/heads/master: acbaa0bf052a363de640725972563a34d61cfb82
4 changes: 2 additions & 2 deletions trunk/drivers/staging/sm7xx/smtcfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ static inline unsigned int chan_to_field(unsigned int chan,
return chan << bf->offset;
}

static int cfb_blank(int blank_mode, struct fb_info *info)
static int smtc_blank(int blank_mode, struct fb_info *info)
{
/* clear DPMS setting */
switch (blank_mode) {
Expand Down Expand Up @@ -653,7 +653,7 @@ static struct fb_ops smtcfb_ops = {
.fb_check_var = smtc_check_var,
.fb_set_par = smtc_set_par,
.fb_setcolreg = smtc_setcolreg,
.fb_blank = cfb_blank,
.fb_blank = smtc_blank,
.fb_fillrect = cfb_fillrect,
.fb_imageblit = cfb_imageblit,
.fb_copyarea = cfb_copyarea,
Expand Down

0 comments on commit 2cbd0de

Please sign in to comment.