svn merge ^/branches/released .

1 files changed, 0 insertions, 39 deletions

diff --git a/xorg-server/hw/xfree86/common/xf86Bus.c b/xorg-server/hw/xfree86/common/xf86Bus.c
index 09b94654c..77693d742 100644
--- a/xorg-server/hw/xfree86/common/xf86Bus.c
+++ b/xorg-server/hw/xfree86/common/xf86Bus.c
@@ -49,8 +49,6 @@
 #include "xf86_OSproc.h"

 #include "xf86VGAarbiter.h"

 

-#include "Pci.h"

-

 /* Entity data */

 EntityPtr *xf86Entities = NULL;	/* Bus slots claimed by drivers */

 int xf86NumEntities = 0;

@@ -113,10 +111,6 @@ xf86BusConfig(void)
     if (xorgHWAccess)

         xorgHWAccess = xf86EnableIO();

 

-    /* Locate bus slot that had register IO enabled at server startup */

-    if (xorgHWAccess)

-        xf86FindPrimaryDevice();

-

     /*

      * Now call each of the Probe functions.  Each successful probe will

      * result in an extra entry added to the xf86Screens[] list for each

@@ -559,39 +553,6 @@ xf86PostScreenInit(void)
     xf86EnterServerState(OPERATING);

 }

 

-/*

- * xf86FindPrimaryDevice() - Find the display device which

- * was active when the server was started.

- */

-void

-xf86FindPrimaryDevice(void)

-{

-    if (primaryBus.type != BUS_NONE) {

-	char *bus;

-	char loc[16];

-

-	switch (primaryBus.type) {

-	case BUS_PCI:

-	    bus = "PCI";

-	    snprintf(loc, sizeof(loc), " %2.2x@%2.2x:%2.2x:%1.1x",

-		     primaryBus.id.pci->bus,

-		     primaryBus.id.pci->domain,

-		     primaryBus.id.pci->dev,

-		     primaryBus.id.pci->func);

-	    break;

-	case BUS_SBUS:

-	    bus = "SBUS";

-	    snprintf(loc, sizeof(loc), " %2.2x", primaryBus.id.sbus.fbNum);

-	    break;

-	default:

-	    bus = "";

-	    loc[0] = '\0';

-	}

-

-	xf86MsgVerb(X_INFO, 2, "Primary Device is: %s%s\n",bus,loc);

-    }

-}

-

 int

 xf86GetLastScrnFlag(int entityIndex)

 {