]>
Commit | Line | Data |
---|---|---|
85ac0369 | 1 | diff -urN xc.orig/extras/drm/linux/drm_memory_debug.h xc/extras/drm/linux/drm_memory_debug.h |
2 | --- xc.orig/extras/drm/linux/drm_memory_debug.h 2004-08-09 01:27:05.464971184 +0200 | |
3 | +++ xc/extras/drm/linux/drm_memory_debug.h 2004-08-09 01:29:48.315214184 +0200 | |
4 | @@ -32,7 +32,7 @@ | |
5 | */ | |
6 | ||
7 | #define __NO_VERSION__ | |
8 | -#include <linux/config.h> | |
9 | + | |
10 | #include "drmP.h" | |
11 | ||
12 | typedef struct drm_mem_stats { | |
13 | diff -urN xc.orig/extras/drm/linux/drm_memory.h xc/extras/drm/linux/drm_memory.h | |
14 | --- xc.orig/extras/drm/linux/drm_memory.h 2004-08-09 01:27:05.445974072 +0200 | |
15 | +++ xc/extras/drm/linux/drm_memory.h 2004-08-09 01:29:48.295217224 +0200 | |
16 | @@ -34,7 +34,7 @@ | |
17 | */ | |
18 | ||
19 | #define __NO_VERSION__ | |
20 | -#include <linux/config.h> | |
21 | + | |
22 | #include <linux/highmem.h> | |
23 | #include "drmP.h" | |
24 | ||
25 | diff -urN xc.orig/extras/drm/linux/drmP.h xc/extras/drm/linux/drmP.h | |
26 | --- xc.orig/extras/drm/linux/drmP.h 2004-08-09 01:27:05.602950208 +0200 | |
27 | +++ xc/extras/drm/linux/drmP.h 2004-08-09 01:29:48.429196856 +0200 | |
28 | @@ -42,7 +42,7 @@ | |
29 | * can build the DRM (part of PI DRI). 4/21/2000 S + B */ | |
30 | #include <asm/current.h> | |
31 | #endif /* __alpha__ */ | |
32 | -#include <linux/config.h> | |
33 | + | |
34 | #include <linux/module.h> | |
35 | #include <linux/kernel.h> | |
36 | #include <linux/miscdevice.h> | |
37 | diff -urN xc.orig/extras/drm/linux/drm_scatter.h xc/extras/drm/linux/drm_scatter.h | |
38 | --- xc.orig/extras/drm/linux/drm_scatter.h 2004-08-09 01:27:05.500965712 +0200 | |
39 | +++ xc/extras/drm/linux/drm_scatter.h 2004-08-09 01:29:48.396201872 +0200 | |
40 | @@ -32,7 +32,7 @@ | |
41 | */ | |
42 | ||
43 | #define __NO_VERSION__ | |
44 | -#include <linux/config.h> | |
45 | + | |
46 | #include <linux/vmalloc.h> | |
47 | #include "drmP.h" | |
48 | ||
49 | diff -urN xc.orig/extras/drm/linux/ffb_drv.c xc/extras/drm/linux/ffb_drv.c | |
50 | --- xc.orig/extras/drm/linux/ffb_drv.c 2004-08-09 01:27:05.610948992 +0200 | |
51 | +++ xc/extras/drm/linux/ffb_drv.c 2004-08-09 01:29:17.416911440 +0200 | |
52 | @@ -4,7 +4,7 @@ | |
53 | * Copyright (C) 2000 David S. Miller (davem@redhat.com) | |
54 | */ | |
55 | ||
56 | -#include <linux/config.h> | |
57 | + | |
58 | #include "ffb.h" | |
59 | #include "drmP.h" | |
60 | ||
61 | diff -urN xc.orig/extras/drm/linux/gamma_drv.c xc/extras/drm/linux/gamma_drv.c | |
62 | --- xc.orig/extras/drm/linux/gamma_drv.c 2004-08-09 01:27:05.519962824 +0200 | |
63 | +++ xc/extras/drm/linux/gamma_drv.c 2004-08-09 01:29:17.406912960 +0200 | |
64 | @@ -29,7 +29,7 @@ | |
65 | * Gareth Hughes <gareth@valinux.com> | |
66 | */ | |
67 | ||
68 | -#include <linux/config.h> | |
69 | + | |
70 | #include "gamma.h" | |
71 | #include "drmP.h" | |
72 | #include "drm.h" | |
73 | diff -urN xc.orig/extras/drm/linux/i810_drv.c xc/extras/drm/linux/i810_drv.c | |
74 | --- xc.orig/extras/drm/linux/i810_drv.c 2004-08-09 01:27:05.527961608 +0200 | |
75 | +++ xc/extras/drm/linux/i810_drv.c 2004-08-09 01:29:17.410912352 +0200 | |
76 | @@ -30,7 +30,7 @@ | |
77 | * Gareth Hughes <gareth@valinux.com> | |
78 | */ | |
79 | ||
80 | -#include <linux/config.h> | |
81 | + | |
82 | #include "i810.h" | |
83 | #include "drmP.h" | |
84 | #include "drm.h" | |
85 | diff -urN xc.orig/extras/drm/linux/i830_drv.c xc/extras/drm/linux/i830_drv.c | |
86 | --- xc.orig/extras/drm/linux/i830_drv.c 2004-08-09 01:27:05.518962976 +0200 | |
87 | +++ xc/extras/drm/linux/i830_drv.c 2004-08-09 01:29:17.406912960 +0200 | |
88 | @@ -32,7 +32,7 @@ | |
89 | * Keith Whitwell <keith@tungstengraphics.com> | |
90 | */ | |
91 | ||
92 | -#include <linux/config.h> | |
93 | + | |
94 | #include "i830.h" | |
95 | #include "drmP.h" | |
96 | #include "drm.h" | |
97 | diff -urN xc.orig/extras/drm/linux/mach64_drv.c xc/extras/drm/linux/mach64_drv.c | |
98 | --- xc.orig/extras/drm/linux/mach64_drv.c 2004-08-09 01:27:05.432976048 +0200 | |
99 | +++ xc/extras/drm/linux/mach64_drv.c 2004-08-09 01:29:17.376917520 +0200 | |
100 | @@ -27,7 +27,7 @@ | |
101 | * Leif Delgass <ldelgass@retinalburn.net> | |
102 | */ | |
103 | ||
104 | -#include <linux/config.h> | |
105 | + | |
106 | #include "mach64.h" | |
107 | #include "drmP.h" | |
108 | #include "drm.h" | |
109 | diff -urN xc.orig/extras/drm/linux/mga_drv.c xc/extras/drm/linux/mga_drv.c | |
110 | --- xc.orig/extras/drm/linux/mga_drv.c 2004-08-09 01:27:05.501965560 +0200 | |
111 | +++ xc/extras/drm/linux/mga_drv.c 2004-08-09 01:29:17.396914480 +0200 | |
112 | @@ -29,7 +29,7 @@ | |
113 | * Gareth Hughes <gareth@valinux.com> | |
114 | */ | |
115 | ||
116 | -#include <linux/config.h> | |
117 | + | |
118 | #include "mga.h" | |
119 | #include "drmP.h" | |
120 | #include "drm.h" | |
121 | diff -urN xc.orig/extras/drm/linux/r128_drv.c xc/extras/drm/linux/r128_drv.c | |
122 | --- xc.orig/extras/drm/linux/r128_drv.c 2004-08-09 01:27:05.572954768 +0200 | |
123 | +++ xc/extras/drm/linux/r128_drv.c 2004-08-09 01:29:17.410912352 +0200 | |
124 | @@ -29,7 +29,7 @@ | |
125 | * Gareth Hughes <gareth@valinux.com> | |
126 | */ | |
127 | ||
128 | -#include <linux/config.h> | |
129 | + | |
130 | #include "r128.h" | |
131 | #include "drmP.h" | |
132 | #include "drm.h" | |
133 | diff -urN xc.orig/extras/drm/linux/radeon_drv.c xc/extras/drm/linux/radeon_drv.c | |
134 | --- xc.orig/extras/drm/linux/radeon_drv.c 2004-08-09 01:27:05.482968448 +0200 | |
135 | +++ xc/extras/drm/linux/radeon_drv.c 2004-08-09 01:29:17.396914480 +0200 | |
136 | @@ -30,7 +30,7 @@ | |
137 | */ | |
138 | ||
139 | ||
140 | -#include <linux/config.h> | |
141 | + | |
142 | #include "radeon.h" | |
143 | #include "drmP.h" | |
144 | #include "drm.h" | |
145 | diff -urN xc.orig/extras/drm/linux/savage_drv.c xc/extras/drm/linux/savage_drv.c | |
146 | --- xc.orig/extras/drm/linux/savage_drv.c 2004-08-09 01:27:05.509964344 +0200 | |
147 | +++ xc/extras/drm/linux/savage_drv.c 2004-08-09 01:29:17.406912960 +0200 | |
148 | @@ -22,7 +22,7 @@ | |
149 | * DEALINGS IN THE SOFTWARE. | |
150 | */ | |
151 | ||
152 | -#include <linux/config.h> | |
153 | + | |
154 | #include "savage.h" | |
155 | #include "drmP.h" | |
156 | #include "savage_drm.h" | |
157 | diff -urN xc.orig/extras/drm/linux/sis_drv.c xc/extras/drm/linux/sis_drv.c | |
158 | --- xc.orig/extras/drm/linux/sis_drv.c 2004-08-09 01:27:05.445974072 +0200 | |
159 | +++ xc/extras/drm/linux/sis_drv.c 2004-08-09 01:29:17.377917368 +0200 | |
160 | @@ -25,7 +25,7 @@ | |
161 | * | |
162 | */ | |
163 | ||
164 | -#include <linux/config.h> | |
165 | + | |
166 | #include "sis.h" | |
167 | #include "drmP.h" | |
168 | #include "sis_drm.h" | |
169 | diff -urN xc.orig/extras/drm/linux/tdfx_drv.c xc/extras/drm/linux/tdfx_drv.c | |
170 | --- xc.orig/extras/drm/linux/tdfx_drv.c 2004-08-09 01:27:05.557957048 +0200 | |
171 | +++ xc/extras/drm/linux/tdfx_drv.c 2004-08-09 01:29:17.410912352 +0200 | |
172 | @@ -30,7 +30,7 @@ | |
173 | * Gareth Hughes <gareth@valinux.com> | |
174 | */ | |
175 | ||
176 | -#include <linux/config.h> | |
177 | + | |
178 | #include "tdfx.h" | |
179 | #include "drmP.h" | |
180 | ||
181 | diff -urN xc.orig/extras/drm/shared/drm.h xc/extras/drm/shared/drm.h | |
182 | --- xc.orig/extras/drm/shared/drm.h 2004-08-09 01:27:05.426976960 +0200 | |
183 | +++ xc/extras/drm/shared/drm.h 2004-08-09 01:29:48.038256288 +0200 | |
184 | @@ -38,7 +38,7 @@ | |
185 | #define _DRM_H_ | |
186 | ||
187 | #if defined(__linux__) | |
188 | -#include <linux/config.h> | |
189 | + | |
190 | #include <asm/ioctl.h> /* For _IO* macros */ | |
191 | #define DRM_IOCTL_NR(n) _IOC_NR(n) | |
192 | #define DRM_IOC_VOID _IOC_NONE | |
193 | diff -urN xc.orig/extras/drm/shared/via_drv.c xc/extras/drm/shared/via_drv.c | |
194 | --- xc.orig/extras/drm/shared/via_drv.c 2004-08-09 01:27:05.365986232 +0200 | |
195 | +++ xc/extras/drm/shared/via_drv.c 2004-08-09 01:29:17.348921776 +0200 | |
196 | @@ -21,7 +21,7 @@ | |
197 | * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | |
198 | * DEALINGS IN THE SOFTWARE. | |
199 | */ | |
200 | -#include <linux/config.h> | |
201 | + | |
202 | #include "via.h" | |
203 | #include "drmP.h" | |
204 | #include "via_drm.h" | |
205 | diff -urN xc.orig/programs/Xserver/hw/xfree86/drivers/sis/init301.h xc/programs/Xserver/hw/xfree86/drivers/sis/init301.h | |
206 | --- xc.orig/programs/Xserver/hw/xfree86/drivers/sis/init301.h 2004-08-09 01:26:14.000000000 +0200 | |
207 | +++ xc/programs/Xserver/hw/xfree86/drivers/sis/init301.h 2004-08-09 01:29:40.912339592 +0200 | |
208 | @@ -71,7 +71,7 @@ | |
209 | #ifdef SIS_CP | |
210 | #undef SIS_CP | |
211 | #endif | |
212 | -#include <linux/config.h> | |
213 | + | |
214 | #include <linux/version.h> | |
215 | #include <asm/io.h> | |
216 | #include <linux/types.h> | |
217 | diff -urN xc.orig/programs/Xserver/hw/xfree86/drivers/sis/init.h xc/programs/Xserver/hw/xfree86/drivers/sis/init.h | |
218 | --- xc.orig/programs/Xserver/hw/xfree86/drivers/sis/init.h 2004-08-09 01:26:14.000000000 +0200 | |
219 | +++ xc/programs/Xserver/hw/xfree86/drivers/sis/init.h 2004-08-09 01:29:40.902341112 +0200 | |
220 | @@ -72,7 +72,7 @@ | |
221 | #ifdef SIS_CP | |
222 | #undef SIS_CP | |
223 | #endif | |
224 | -#include <linux/config.h> | |
225 | + | |
226 | #include <linux/version.h> | |
227 | #include <linux/types.h> | |
228 | #include <asm/io.h> | |
229 | diff -urN xc.orig/programs/Xserver/hw/xfree86/drivers/sis/osdef.h xc/programs/Xserver/hw/xfree86/drivers/sis/osdef.h | |
230 | --- xc.orig/programs/Xserver/hw/xfree86/drivers/sis/osdef.h 2004-08-09 01:26:14.000000000 +0200 | |
231 | +++ xc/programs/Xserver/hw/xfree86/drivers/sis/osdef.h 2004-08-09 01:29:40.941335184 +0200 | |
232 | @@ -84,7 +84,7 @@ | |
233 | /**********************************************************************/ | |
234 | ||
235 | #ifdef LINUX_KERNEL | |
236 | -#include <linux/config.h> | |
237 | + | |
238 | #include <linux/version.h> | |
239 | ||
240 | #ifdef CONFIG_FB_SIS_300 |