| @@ -67,29 +67,27 @@ | | | @@ -67,29 +67,27 @@ |
67 | * negligence, tort, under statute, in equity, at law or otherwise, even if | | 67 | * negligence, tort, under statute, in equity, at law or otherwise, even if |
68 | * advised of the possibility of such damage. | | 68 | * advised of the possibility of such damage. |
69 | */ | | 69 | */ |
70 | | | 70 | |
71 | #ifdef HAVE_CONFIG_H | | 71 | #ifdef HAVE_CONFIG_H |
72 | #include "config.h" | | 72 | #include "config.h" |
73 | #endif | | 73 | #endif |
74 | | | 74 | |
75 | /* All drivers should typically include these */ | | 75 | /* All drivers should typically include these */ |
76 | #include "xf86.h" | | 76 | #include "xf86.h" |
77 | #include "xf86_OSproc.h" | | 77 | #include "xf86_OSproc.h" |
78 | #include "xf86Priv.h" | | 78 | #include "xf86Priv.h" |
79 | | | 79 | |
80 | #if defined(HAVE_ISA) | | | |
81 | #include <sys/mman.h> | | 80 | #include <sys/mman.h> |
82 | #endif | | | |
83 | | | 81 | |
84 | /* Everything using inb/outb, etc needs "compiler.h" */ | | 82 | /* Everything using inb/outb, etc needs "compiler.h" */ |
85 | #include "compiler.h" | | 83 | #include "compiler.h" |
86 | | | 84 | |
87 | /* Drivers that need to access the PCI config space directly need this */ | | 85 | /* Drivers that need to access the PCI config space directly need this */ |
88 | #include "xf86Pci.h" | | 86 | #include "xf86Pci.h" |
89 | | | 87 | |
90 | #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 | | 88 | #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 |
91 | /* Standard resources are defined here */ | | 89 | /* Standard resources are defined here */ |
92 | #include "xf86Resources.h" | | 90 | #include "xf86Resources.h" |
93 | | | 91 | |
94 | /* Needed by Resources Access Control (RAC) */ | | 92 | /* Needed by Resources Access Control (RAC) */ |
95 | #include "xf86RAC.h" | | 93 | #include "xf86RAC.h" |