diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-08-23 18:19:17 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-08-23 18:19:17 -0700 |
| commit | 8b6b40b7271acd81a9548f502c18f46f3b640640 (patch) | |
| tree | 1462cb63501a8bdd8845d7c62e038b6a86b78fd5 /fb/fboverlay.c | |
| parent | ab7a6d860d4a275a810a64b1ba7b13726ed10575 (diff) | |
| parent | 3305d17195e3a0a5555300555bd7703312fa489f (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-reworkpci-rework
Conflicts:
hw/xfree86/common/xf86.h
hw/xfree86/common/xf86Init.c
hw/xfree86/common/xf86pciBus.c
hw/xfree86/int10/generic.c
hw/xfree86/int10/helper_exec.c
hw/xfree86/loader/xf86sym.c
hw/xfree86/os-support/bus/Pci.c
hw/xfree86/os-support/bus/Pci.h
hw/xfree86/os-support/bus/linuxPci.c
hw/xfree86/os-support/linux/int10/linux.c
Diffstat (limited to 'fb/fboverlay.c')
| -rw-r--r-- | fb/fboverlay.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fb/fboverlay.c b/fb/fboverlay.c index 1e3d756ed..5d7481eed 100644 --- a/fb/fboverlay.c +++ b/fb/fboverlay.c @@ -413,11 +413,7 @@ fbOverlayFinishScreenInit(ScreenPtr pScreen, return FALSE; if (! miScreenInit(pScreen, 0, xsize, ysize, dpix, dpiy, 0, depth1, ndepths, depths, - defaultVisual, nvisuals, visuals -#ifdef FB_OLD_MISCREENINIT - , (miBSFuncPtr) 0 -#endif - )) + defaultVisual, nvisuals, visuals)) return FALSE; /* MI thinks there's no frame buffer */ #ifdef MITSHM |