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

index e85a72f..cc8976f 100644

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

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

@@ -2,6 +2,7 @@

* Copyright 2003 by David H. Dawes.

* Copyright 2003 by X-Oz Technologies.

* All rights reserved.

+ * Copyright (c) 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"),

@@ -229,16 +230,7 @@

#ifdef XSERVER_PLATFORM_BUS

i = xf86PlatformMatchDriver(matches, nmatches);

#endif

-

-#ifdef __sparc__

- if (i < (nmatches - 1))

- {

- char *sbusDriver = sparcDriverName();

-

- if (sbusDriver)

- matches[i++] = xnfstrdup(sbusDriver);

- }

-#endif

+

#ifdef XSERVER_LIBPCIACCESS

if (i < (nmatches - 1))

i = xf86PciMatchDriver(matches, nmatches);

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

index e101537..8af532d 100644

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

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

@@ -1,5 +1,6 @@

/*

* Copyright (c) 1997-2003 by The XFree86 Project, Inc.

+ * Copyright (c) 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"),

@@ -207,9 +208,6 @@ xf86BusProbe(void)

#ifdef XSERVER_LIBPCIACCESS

xf86PciProbe();

#endif

-#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)

- xf86SbusProbe();

-#endif

}

/*