xserver: Branch 'master'

[Tiago Vignatti]

 hw/xfree86/common/xf86Privstr.h            |    1 -
 hw/xfree86/os-support/shared/stdResource.c |    4 ----
 hw/xfree86/os-support/xf86_OSproc.h        |    4 ----
 hw/xfree86/ramdac/xf86RamDacCmap.c         |    3 ---
 4 files changed, 12 deletions(-)

New commits:
commit 686e4867302a741f3029c4105b997d0f0ac7c13c
Author: Tiago Vignatti <tiago.vignatti at nokia.com>
Date:   Tue Jul 14 17:11:13 2009 +0300

    xfree86: remove a bunch of unused pci headers
    
    Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>

diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
index 52960e5..1a2f736 100644
--- a/hw/xfree86/common/xf86Privstr.h
+++ b/hw/xfree86/common/xf86Privstr.h
@@ -34,7 +34,6 @@
 #ifndef _XF86PRIVSTR_H
 #define _XF86PRIVSTR_H
 
-#include "xf86Pci.h"
 #include "xf86str.h"
 
 typedef enum {
diff --git a/hw/xfree86/os-support/shared/stdResource.c b/hw/xfree86/os-support/shared/stdResource.c
index 9db349b..491b4ce 100644
--- a/hw/xfree86/os-support/shared/stdResource.c
+++ b/hw/xfree86/os-support/shared/stdResource.c
@@ -35,14 +35,10 @@
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86Privstr.h"
-#include "xf86Pci.h"
 #define NEED_OS_RAC_PROTOS
 #include "xf86_OSlib.h"
 #include "xf86Resources.h"
 
-/* Avoid Imakefile changes */
-#include "bus/Pci.h"
-
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \
 	defined(__NetBSD__) || defined(__OpenBSD__) || \
 	defined(__DragonFly__) || defined(__sun) || defined(__GNU__)
diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h
index 507db18..0f16607 100644
--- a/hw/xfree86/os-support/xf86_OSproc.h
+++ b/hw/xfree86/os-support/xf86_OSproc.h
@@ -68,10 +68,6 @@
 #ifndef _XF86_OSPROC_H
 #define _XF86_OSPROC_H
 
-#ifdef XF86_OS_PRIVS
-#include "xf86Pci.h"
-#endif
-
 /*
  * The actual prototypes have been pulled into this seperate file so
  * that they can can be used without pulling in all of the OS specific
diff --git a/hw/xfree86/ramdac/xf86RamDacCmap.c b/hw/xfree86/ramdac/xf86RamDacCmap.c
index 600fe3f..c6dc831 100644
--- a/hw/xfree86/ramdac/xf86RamDacCmap.c
+++ b/hw/xfree86/ramdac/xf86RamDacCmap.c
@@ -39,9 +39,6 @@
 #include "colormapst.h"
 #include "xf86RamDacPriv.h"
 
-#include "xf86PciInfo.h"
-#include "xf86Pci.h"
-
 void
 RamDacLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors,
 		 VisualPtr pVisual)