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 /hw/xfree86/common/xf86Helper.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 'hw/xfree86/common/xf86Helper.c')
| -rw-r--r-- | hw/xfree86/common/xf86Helper.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index e2da752d1..63970dce8 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -484,16 +484,6 @@ xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int dummy, int fbbpp, scrp->bitsPerPixelFrom = X_DEFAULT; scrp->depthFrom = X_DEFAULT; -#if BITMAP_SCANLINE_UNIT == 64 - /* - * For platforms with 64-bit scanlines, modify the driver's depth24flags - * to remove preferences for packed 24bpp modes, which are not currently - * supported on these platforms. - */ - depth24flags &= ~(SupportConvert32to24 | SupportConvert32to24 | - PreferConvert24to32 | PreferConvert32to24); -#endif - if (xf86FbBpp > 0) { scrp->bitsPerPixel = xf86FbBpp; scrp->bitsPerPixelFrom = X_CMDLINE; @@ -2444,12 +2434,8 @@ xf86LoadOneModule(char *name, pointer opt) if (!name) return NULL; -#ifndef NORMALISE_MODULE_NAME - Name = xstrdup(name); -#else /* Normalise the module name */ Name = xf86NormalizeName(name); -#endif /* Skip empty names */ if (Name == NULL) |