[git pull] revert + dri1 fix

[Dave Airlie]

Hi Keith,

the dri1 fix has gone unreviewed on the list, even by those who
created the problem, but it works here and I'd rather not forget it
again.

The non-pci change breaks all multi-gpu setups in Fedora here, so we
should drop it for now until we know what is the correct way to
implement it, I'm guessing the code around it needs some work also.

Dave.

The following changes since commit b51a1bd2766e7dc975ca8f1cacc3f8bd0e1a68a3:

  Merge remote-tracking branch 'whot/for-keith' (2012-11-30 09:31:46 -0800)

are available in the git repository at:


  ssh://people.freedesktop.org/~airlied/xserver for-keithp

for you to fetch changes up to 6b4aa8a359822cc70666de3b18744f05dd9b5f45:

  Revert "xf86: Fix non-PCI configuration-less setups" (2012-12-12
12:56:46 +1000)

----------------------------------------------------------------
Dave Airlie (2):
      dri1: fix dri1 startup since 459c6da0f907ba33d733c7e62a116184ba2f14e5
      Revert "xf86: Fix non-PCI configuration-less setups"

 hw/xfree86/common/xf86platformBus.c | 8 --------
 hw/xfree86/dri/dri.c                | 7 +++++--
 2 files changed, 5 insertions(+), 10 deletions(-)