[PULL] bus cleanup, darwin hw/xfree86, build regression fixes

[Jeremy Huddleston]

Hi Keith,

I believe this failure is coming from b61950dc616402bbf3fb0774e9289d32c0f42c83 which removed these from xfree86/common/xf86str.h

#include "xf86Pci.h"
#include <pciaccess.h>

I squashed your change below into b61950dc616402bbf3fb0774e9289d32c0f42c83 and pushed the new branch.

I'm also testing it on tifa32-linux tinderbox:
http://tinderbox.x.org/builds/2011-09-23-0007




On Sep 22, 2011, at 22:29, Keith Packard wrote:

> On Thu, 22 Sep 2011 19:52:05 -0700, Jeremy Huddleston <jeremyhu at apple.com> wrote:
> 
>>  git://people.freedesktop.org/~jeremyhu/xserver master
> 
> This sequence needs the following patch somewhere:
> 
> diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c
> index 23c48eb..e244a2d 100644
> --- a/hw/xfree86/modes/xf86Cursors.c
> +++ b/hw/xfree86/modes/xf86Cursors.c
> @@ -33,6 +33,7 @@
> #include <string.h>
> #include <stdio.h>
> 
> +#include <X11/Xarch.h>
> #include "xf86.h"
> #include "xf86DDC.h"
> #include "xf86Crtc.h"
> 
> -- 
> keith.packard at intel.com