diff options
| author | Aaro Koskinen | 2011-10-11 20:47:17 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-10-12 17:51:45 +0200 |
| commit | 7548a83e5f8885679fa568e55242500b6164ee2e (patch) | |
| tree | cc17d04c863201bfa2b577ca1e909fa3340d664b /drivers/staging/xgifb | |
| parent | staging: xgifb: inline XGIfb_query_VGA_config_space() (diff) | |
| download | kernel-qcow2-linux-7548a83e5f8885679fa568e55242500b6164ee2e.tar.gz kernel-qcow2-linux-7548a83e5f8885679fa568e55242500b6164ee2e.tar.xz kernel-qcow2-linux-7548a83e5f8885679fa568e55242500b6164ee2e.zip | |
staging: xgifb: add a global variable for the default refresh rate
Add a global variable for the default refresh rate. This is done to
get rid of references to xgi_video_info before the probe routine, which
should allocate the xgi_video_info dynamically in the future.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/xgifb')
| -rw-r--r-- | drivers/staging/xgifb/XGI_main_26.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index 09aea30bb826..f0f4746bf174 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -50,6 +50,7 @@ static char *mode; static int vesa = -1; +static unsigned int refresh_rate; /* -------------------- Macro definitions ---------------------------- */ @@ -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)) { @@ -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( |