Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 268791
b: refs/heads/master
c: 7548a83
h: refs/heads/master
i:
  268789: 7105756
  268787: 066c8b8
  268783: f1c610f
v: v3
  • Loading branch information
Aaro Koskinen authored and Greg Kroah-Hartman committed Oct 12, 2011
1 parent 5aab06e commit d5a71bd
Show file tree
Hide file tree
Showing 2 changed files with 5 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: 6048d761d23958218ea0e67decafdfac81aed663
refs/heads/master: 7548a83e5f8885679fa568e55242500b6164ee2e
6 changes: 4 additions & 2 deletions trunk/drivers/staging/xgifb/XGI_main_26.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@

static char *mode;
static int vesa = -1;
static unsigned int refresh_rate;

/* -------------------- Macro definitions ---------------------------- */

Expand Down Expand Up @@ -1890,9 +1891,9 @@ static int __init XGIfb_setup(char *options)
} else if (!strncmp(this_opt, "vesa:", 5)) {
vesa = xgifb_optval(this_opt, 5);
} else if (!strncmp(this_opt, "vrate:", 6)) {
xgi_video_info.refresh_rate = xgifb_optval(this_opt, 6);
refresh_rate = xgifb_optval(this_opt, 6);
} else if (!strncmp(this_opt, "rate:", 5)) {
xgi_video_info.refresh_rate = xgifb_optval(this_opt, 5);
refresh_rate = xgifb_optval(this_opt, 5);
} else if (!strncmp(this_opt, "crt1off", 7)) {
XGIfb_crt1off = 1;
} else if (!strncmp(this_opt, "filter:", 7)) {
Expand Down Expand Up @@ -2276,6 +2277,7 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
XGIfb_mode_no = XGIbios_mode[xgifb_mode_idx].mode_no;

/* yilin set default refresh rate */
xgi_video_info.refresh_rate = refresh_rate;
if (xgi_video_info.refresh_rate == 0)
xgi_video_info.refresh_rate = 60;
if (XGIfb_search_refresh_rate(
Expand Down

0 comments on commit d5a71bd

Please sign in to comment.