diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-15 04:51:40 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-15 04:51:40 -0500 |
| commit | f055408957750cf759162c364c2a4dfe19765844 (patch) | |
| tree | aecc0a13c582d310902e6fa95d8853c627828fcc /drivers/video/nvidia/nvidia.c | |
| parent | 83cbd33aae2c3cd14f80a8abf733033a57aa4923 (diff) | |
| parent | 4060994c3e337b40e0f6fa8ce2cc178e021baf3d (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/video/nvidia/nvidia.c')
| -rw-r--r-- | drivers/video/nvidia/nvidia.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c index 0b40a2a721c1..bee09c6e48f6 100644 --- a/drivers/video/nvidia/nvidia.c +++ b/drivers/video/nvidia/nvidia.c | |||
| @@ -1301,7 +1301,7 @@ static int nvidiafb_pan_display(struct fb_var_screeninfo *var, | |||
| 1301 | struct nvidia_par *par = info->par; | 1301 | struct nvidia_par *par = info->par; |
| 1302 | u32 total; | 1302 | u32 total; |
| 1303 | 1303 | ||
| 1304 | total = info->var.yoffset * info->fix.line_length + info->var.xoffset; | 1304 | total = var->yoffset * info->fix.line_length + var->xoffset; |
| 1305 | 1305 | ||
| 1306 | NVSetStartAddress(par, total); | 1306 | NVSetStartAddress(par, total); |
| 1307 | 1307 | ||