diff --git a/[refs] b/[refs] index 4a8225095a52..0599d98eaae9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15ebe6c657db155fbb04143b1a655b8a58b0402e +refs/heads/master: 7c1387e0ec02f5b44f292b6639a93a2aea949ba0 diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c index 1bff7f6caa4f..8c5a6e8a695e 100644 --- a/trunk/drivers/staging/xgifb/XGI_main_26.c +++ b/trunk/drivers/staging/xgifb/XGI_main_26.c @@ -2414,10 +2414,8 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, fb_alloc_cmap(&fb_info->cmap, 256 , 0); #ifdef CONFIG_MTRR - xgi_video_info.mtrr = mtrr_add( - (unsigned int) xgi_video_info.video_base, - (unsigned int) xgi_video_info.video_size, - MTRR_TYPE_WRCOMB, 1); + xgi_video_info.mtrr = mtrr_add(xgi_video_info.video_base, + xgi_video_info.video_size, MTRR_TYPE_WRCOMB, 1); if (xgi_video_info.mtrr >= 0) dev_info(&pdev->dev, "added MTRR\n"); #endif