# Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.

#

# Permission is hereby granted, free of charge, to any person obtaining a

# copy of this software and associated documentation files (the "Software"),

# to deal in the Software without restriction, including without limitation

# the rights to use, copy, modify, merge, publish, distribute, sublicense,

# and/or sell copies of the Software, and to permit persons to whom the

# Software is furnished to do so, subject to the following conditions:

#

# The above copyright notice and this permission notice (including the next

# paragraph) shall be included in all copies or substantial portions of the

# Software.

#

# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

# DEALINGS IN THE SOFTWARE.

Add Sun's old "bitstream" font module to the list of obsolete modules

to ignore in xorg.conf files.

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c

index af8a89e..ab9a37a 100644

--- a/hw/xfree86/common/xf86Config.c

+++ b/hw/xfree86/common/xf86Config.c

@@ -245,6 +245,7 @@ xf86ModulelistFromConfig(pointer **optlist)

const char *ignore[] = { "GLcore", "speedo", "bitmap", "drm",

"freetype", "type1",

+ "bitstream",

NULL

};

pointer *optarray;