1386N/Adiff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c

1386N/Aindex e85a72f..cc8976f 100644

1386N/A--- a/hw/xfree86/common/xf86AutoConfig.c

1386N/A+++ b/hw/xfree86/common/xf86AutoConfig.c

1386N/A@@ -2,6 +2,7 @@

1386N/A * Copyright 2003 by David H. Dawes.

1386N/A * Copyright 2003 by X-Oz Technologies.

1386N/A * All rights reserved.

1386N/A+ * Copyright (c) 2013 Oracle and/or its affiliates. All Rights Reserved.

1386N/A *

1386N/A * Permission is hereby granted, free of charge, to any person obtaining a

1386N/A * copy of this software and associated documentation files (the "Software"),

1386N/A@@ -229,16 +230,7 @@

1386N/A #ifdef XSERVER_PLATFORM_BUS

1386N/A i = xf86PlatformMatchDriver(matches, nmatches);

1386N/A #endif

1386N/A-

1386N/A-#ifdef __sparc__

1386N/A- if (i < (nmatches - 1))

1386N/A- {

1386N/A- char *sbusDriver = sparcDriverName();

1386N/A-

1386N/A- if (sbusDriver)

1386N/A- matches[i++] = xnfstrdup(sbusDriver);

1386N/A- }

1386N/A-#endif

1386N/A+

1386N/A #ifdef XSERVER_LIBPCIACCESS

1386N/A if (i < (nmatches - 1))

1386N/A i = xf86PciMatchDriver(matches, nmatches);

1386N/Adiff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c

1386N/Aindex e101537..8af532d 100644

1386N/A--- a/hw/xfree86/common/xf86Bus.c

1386N/A+++ b/hw/xfree86/common/xf86Bus.c

1386N/A@@ -1,5 +1,6 @@

1386N/A /*

1386N/A * Copyright (c) 1997-2003 by The XFree86 Project, Inc.

1386N/A+ * Copyright (c) 2013 Oracle and/or its affiliates. All Rights Reserved.

1386N/A *

1386N/A * Permission is hereby granted, free of charge, to any person obtaining a

1386N/A * copy of this software and associated documentation files (the "Software"),

1386N/A@@ -207,9 +208,6 @@ xf86BusProbe(void)

1386N/A #ifdef XSERVER_LIBPCIACCESS

1386N/A xf86PciProbe();

1386N/A #endif

1386N/A-#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)

1386N/A- xf86SbusProbe();

1386N/A-#endif

1386N/A }

1386N/A

1386N/A /*