summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Vignatti <tiago.vignatti@nokia.com>2010-06-01 16:16:53 +0300
committerTiago Vignatti <tiago.vignatti@nokia.com>2010-09-14 18:50:57 +0300
commit49b817501f97d55480063c0b62544b3af75b4b7c (patch)
treed2deb136d6f14e3941f754ff465bcd0fac23bf0c
parentd9c682a5e250677883c4d375ca84cf184ee19d77 (diff)
xfree86: bus: remove xfree86 and few other references from OS files
Conceptually, os-support should have only a basic set of OS helpers which wouldn't mix with any DDX common structure (e.g. windowing structures, etc) This patch removes some xfree86-only and a few other unused references from os-support/bus. Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
-rw-r--r--hw/xfree86/os-support/bus/Pci.c11
-rw-r--r--hw/xfree86/os-support/bus/linuxPci.c4
2 files changed, 0 insertions, 15 deletions
diff --git a/hw/xfree86/os-support/bus/Pci.c b/hw/xfree86/os-support/bus/Pci.c
index a0a597d87..fe4850ecd 100644
--- a/hw/xfree86/os-support/bus/Pci.c
+++ b/hw/xfree86/os-support/bus/Pci.c
@@ -124,19 +124,8 @@
#include <xorg-config.h>
#endif
-#include <errno.h>
-#include <signal.h>
-#include "compiler.h"
-#include "xf86.h"
-#include "xf86Priv.h"
-#define XF86_OS_PRIVS
-#include "xf86_OSproc.h"
#include "Pci.h"
-#include <pciaccess.h>
-
-/* Global data */
-
PCITAG
pciTag(int busnum, int devnum, int funcnum)
{
diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c
index 289315ebc..fcfdbcb67 100644
--- a/hw/xfree86/os-support/bus/linuxPci.c
+++ b/hw/xfree86/os-support/bus/linuxPci.c
@@ -49,12 +49,8 @@
#endif
#include <stdio.h>
-#include "compiler.h"
-#include "xf86.h"
-#include "xf86Priv.h"
#include "xf86_OSlib.h"
#include "Pci.h"
-#include <dirent.h>
static const struct pci_id_match match_host_bridge = {
PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY,