]>
Commit | Line | Data |
---|---|---|
48a3a761 AM |
1 | diff -ur X11-6.9.0.org/xc/extras/drm/linux/drm_memory_debug.h X11-6.9.0/xc/extras/drm/linux/drm_memory_debug.h |
2 | --- X11-6.9.0.org/xc/extras/drm/linux/drm_memory_debug.h 2005-06-15 20:31:47.000000000 +0200 | |
3 | +++ X11-6.9.0/xc/extras/drm/linux/drm_memory_debug.h 2005-12-22 11:43:11.110963000 +0100 | |
4 | @@ -31,7 +31,7 @@ | |
5 | * OTHER DEALINGS IN THE SOFTWARE. | |
85ac0369 | 6 | */ |
7 | ||
85ac0369 | 8 | -#include <linux/config.h> |
9 | + | |
10 | #include "drmP.h" | |
11 | ||
12 | typedef struct drm_mem_stats { | |
48a3a761 AM |
13 | diff -ur X11-6.9.0.org/xc/extras/drm/linux/drm_memory.h X11-6.9.0/xc/extras/drm/linux/drm_memory.h |
14 | --- X11-6.9.0.org/xc/extras/drm/linux/drm_memory.h 2005-06-15 20:31:47.000000000 +0200 | |
15 | +++ X11-6.9.0/xc/extras/drm/linux/drm_memory.h 2005-12-22 11:43:11.150963000 +0100 | |
16 | @@ -33,7 +33,7 @@ | |
17 | * OTHER DEALINGS IN THE SOFTWARE. | |
85ac0369 | 18 | */ |
19 | ||
85ac0369 | 20 | -#include <linux/config.h> |
21 | + | |
22 | #include <linux/highmem.h> | |
23 | #include "drmP.h" | |
24 | ||
48a3a761 AM |
25 | diff -ur X11-6.9.0.org/xc/extras/drm/linux/drmP.h X11-6.9.0/xc/extras/drm/linux/drmP.h |
26 | --- X11-6.9.0.org/xc/extras/drm/linux/drmP.h 2005-10-18 04:49:47.000000000 +0200 | |
27 | +++ X11-6.9.0/xc/extras/drm/linux/drmP.h 2005-12-22 11:43:11.140963000 +0100 | |
85ac0369 | 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> | |
48a3a761 AM |
37 | diff -ur X11-6.9.0.org/xc/extras/drm/linux/drm_scatter.h X11-6.9.0/xc/extras/drm/linux/drm_scatter.h |
38 | --- X11-6.9.0.org/xc/extras/drm/linux/drm_scatter.h 2005-06-15 20:31:48.000000000 +0200 | |
39 | +++ X11-6.9.0/xc/extras/drm/linux/drm_scatter.h 2005-12-22 11:43:11.130963000 +0100 | |
40 | @@ -31,7 +31,7 @@ | |
41 | * DEALINGS IN THE SOFTWARE. | |
85ac0369 | 42 | */ |
43 | ||
85ac0369 | 44 | -#include <linux/config.h> |
45 | + | |
46 | #include <linux/vmalloc.h> | |
47 | #include "drmP.h" | |
48 | ||
48a3a761 AM |
49 | diff -ur X11-6.9.0.org/xc/extras/drm/linux/ffb_drv.c X11-6.9.0/xc/extras/drm/linux/ffb_drv.c |
50 | --- X11-6.9.0.org/xc/extras/drm/linux/ffb_drv.c 2005-06-15 20:31:49.000000000 +0200 | |
51 | +++ X11-6.9.0/xc/extras/drm/linux/ffb_drv.c 2005-12-22 11:43:11.190963000 +0100 | |
85ac0369 | 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 | ||
48a3a761 AM |
61 | diff -ur X11-6.9.0.org/xc/extras/drm/linux/i810_drv.c X11-6.9.0/xc/extras/drm/linux/i810_drv.c |
62 | --- X11-6.9.0.org/xc/extras/drm/linux/i810_drv.c 2005-06-15 20:31:49.000000000 +0200 | |
63 | +++ X11-6.9.0/xc/extras/drm/linux/i810_drv.c 2005-12-22 11:43:11.120963000 +0100 | |
85ac0369 | 64 | @@ -30,7 +30,7 @@ |
65 | * Gareth Hughes <gareth@valinux.com> | |
66 | */ | |
67 | ||
68 | -#include <linux/config.h> | |
69 | + | |
70 | #include "i810.h" | |
71 | #include "drmP.h" | |
72 | #include "drm.h" | |
48a3a761 AM |
73 | diff -ur X11-6.9.0.org/xc/extras/drm/linux/i830_drv.c X11-6.9.0/xc/extras/drm/linux/i830_drv.c |
74 | --- X11-6.9.0.org/xc/extras/drm/linux/i830_drv.c 2005-06-15 20:31:50.000000000 +0200 | |
75 | +++ X11-6.9.0/xc/extras/drm/linux/i830_drv.c 2005-12-22 11:43:11.150963000 +0100 | |
85ac0369 | 76 | @@ -32,7 +32,7 @@ |
77 | * Keith Whitwell <keith@tungstengraphics.com> | |
78 | */ | |
79 | ||
80 | -#include <linux/config.h> | |
81 | + | |
82 | #include "i830.h" | |
83 | #include "drmP.h" | |
84 | #include "drm.h" | |
48a3a761 AM |
85 | diff -ur X11-6.9.0.org/xc/extras/drm/linux/mach64_drv.c X11-6.9.0/xc/extras/drm/linux/mach64_drv.c |
86 | --- X11-6.9.0.org/xc/extras/drm/linux/mach64_drv.c 2005-06-15 20:31:47.000000000 +0200 | |
87 | +++ X11-6.9.0/xc/extras/drm/linux/mach64_drv.c 2005-12-22 11:43:11.170963000 +0100 | |
85ac0369 | 88 | @@ -27,7 +27,7 @@ |
89 | * Leif Delgass <ldelgass@retinalburn.net> | |
90 | */ | |
91 | ||
92 | -#include <linux/config.h> | |
93 | + | |
94 | #include "mach64.h" | |
95 | #include "drmP.h" | |
96 | #include "drm.h" | |
48a3a761 AM |
97 | diff -ur X11-6.9.0.org/xc/extras/drm/linux/mga_drv.c X11-6.9.0/xc/extras/drm/linux/mga_drv.c |
98 | --- X11-6.9.0.org/xc/extras/drm/linux/mga_drv.c 2005-06-15 20:31:47.000000000 +0200 | |
99 | +++ X11-6.9.0/xc/extras/drm/linux/mga_drv.c 2005-12-22 11:43:11.210963000 +0100 | |
85ac0369 | 100 | @@ -29,7 +29,7 @@ |
101 | * Gareth Hughes <gareth@valinux.com> | |
102 | */ | |
103 | ||
104 | -#include <linux/config.h> | |
105 | + | |
106 | #include "mga.h" | |
107 | #include "drmP.h" | |
108 | #include "drm.h" | |
48a3a761 AM |
109 | diff -ur X11-6.9.0.org/xc/extras/drm/linux/r128_drv.c X11-6.9.0/xc/extras/drm/linux/r128_drv.c |
110 | --- X11-6.9.0.org/xc/extras/drm/linux/r128_drv.c 2005-06-15 20:31:49.000000000 +0200 | |
111 | +++ X11-6.9.0/xc/extras/drm/linux/r128_drv.c 2005-12-22 11:43:11.170963000 +0100 | |
85ac0369 | 112 | @@ -29,7 +29,7 @@ |
113 | * Gareth Hughes <gareth@valinux.com> | |
114 | */ | |
115 | ||
116 | -#include <linux/config.h> | |
117 | + | |
118 | #include "r128.h" | |
119 | #include "drmP.h" | |
120 | #include "drm.h" | |
48a3a761 AM |
121 | diff -ur X11-6.9.0.org/xc/extras/drm/linux/radeon_drv.c X11-6.9.0/xc/extras/drm/linux/radeon_drv.c |
122 | --- X11-6.9.0.org/xc/extras/drm/linux/radeon_drv.c 2005-06-15 20:31:48.000000000 +0200 | |
123 | +++ X11-6.9.0/xc/extras/drm/linux/radeon_drv.c 2005-12-22 11:43:11.210963000 +0100 | |
85ac0369 | 124 | @@ -30,7 +30,7 @@ |
125 | */ | |
126 | ||
127 | ||
128 | -#include <linux/config.h> | |
129 | + | |
130 | #include "radeon.h" | |
131 | #include "drmP.h" | |
132 | #include "drm.h" | |
48a3a761 AM |
133 | diff -ur X11-6.9.0.org/xc/extras/drm/linux/savage_drv.c X11-6.9.0/xc/extras/drm/linux/savage_drv.c |
134 | --- X11-6.9.0.org/xc/extras/drm/linux/savage_drv.c 2005-06-15 20:31:49.000000000 +0200 | |
135 | +++ X11-6.9.0/xc/extras/drm/linux/savage_drv.c 2005-12-22 11:43:11.160963000 +0100 | |
85ac0369 | 136 | @@ -22,7 +22,7 @@ |
137 | * DEALINGS IN THE SOFTWARE. | |
138 | */ | |
139 | ||
140 | -#include <linux/config.h> | |
141 | + | |
142 | #include "savage.h" | |
143 | #include "drmP.h" | |
144 | #include "savage_drm.h" | |
48a3a761 AM |
145 | diff -ur X11-6.9.0.org/xc/extras/drm/linux/sis_drv.c X11-6.9.0/xc/extras/drm/linux/sis_drv.c |
146 | --- X11-6.9.0.org/xc/extras/drm/linux/sis_drv.c 2005-06-15 20:31:48.000000000 +0200 | |
147 | +++ X11-6.9.0/xc/extras/drm/linux/sis_drv.c 2005-12-22 11:43:11.240963000 +0100 | |
85ac0369 | 148 | @@ -25,7 +25,7 @@ |
149 | * | |
150 | */ | |
151 | ||
152 | -#include <linux/config.h> | |
153 | + | |
154 | #include "sis.h" | |
155 | #include "drmP.h" | |
156 | #include "sis_drm.h" | |
48a3a761 AM |
157 | diff -ur X11-6.9.0.org/xc/extras/drm/linux/tdfx_drv.c X11-6.9.0/xc/extras/drm/linux/tdfx_drv.c |
158 | --- X11-6.9.0.org/xc/extras/drm/linux/tdfx_drv.c 2005-06-15 20:31:47.000000000 +0200 | |
159 | +++ X11-6.9.0/xc/extras/drm/linux/tdfx_drv.c 2005-12-22 11:43:11.220963000 +0100 | |
85ac0369 | 160 | @@ -30,7 +30,7 @@ |
161 | * Gareth Hughes <gareth@valinux.com> | |
162 | */ | |
163 | ||
164 | -#include <linux/config.h> | |
165 | + | |
166 | #include "tdfx.h" | |
167 | #include "drmP.h" | |
168 | ||
48a3a761 AM |
169 | diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/drm_memory.c X11-6.9.0/xc/extras/drm/linux-core/drm_memory.c |
170 | --- X11-6.9.0.org/xc/extras/drm/linux-core/drm_memory.c 2005-11-30 23:59:11.000000000 +0100 | |
171 | +++ X11-6.9.0/xc/extras/drm/linux-core/drm_memory.c 2005-12-22 11:43:10.970963000 +0100 | |
172 | @@ -33,7 +33,7 @@ | |
173 | * OTHER DEALINGS IN THE SOFTWARE. | |
174 | */ | |
175 | ||
176 | -#include <linux/config.h> | |
177 | + | |
178 | #include <linux/highmem.h> | |
179 | #include "drmP.h" | |
180 | ||
181 | diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/drm_memory_debug.c X11-6.9.0/xc/extras/drm/linux-core/drm_memory_debug.c | |
182 | --- X11-6.9.0.org/xc/extras/drm/linux-core/drm_memory_debug.c 2005-11-30 23:59:11.000000000 +0100 | |
183 | +++ X11-6.9.0/xc/extras/drm/linux-core/drm_memory_debug.c 2005-12-22 11:43:10.840963000 +0100 | |
184 | @@ -31,7 +31,7 @@ | |
185 | * OTHER DEALINGS IN THE SOFTWARE. | |
186 | */ | |
187 | ||
188 | -#include <linux/config.h> | |
189 | + | |
190 | #include "drmP.h" | |
191 | ||
192 | #ifdef DEBUG_MEMORY | |
193 | diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/drm_memory_debug.h X11-6.9.0/xc/extras/drm/linux-core/drm_memory_debug.h | |
194 | --- X11-6.9.0.org/xc/extras/drm/linux-core/drm_memory_debug.h 2005-10-18 04:24:08.000000000 +0200 | |
195 | +++ X11-6.9.0/xc/extras/drm/linux-core/drm_memory_debug.h 2005-12-22 11:43:10.890963000 +0100 | |
196 | @@ -31,7 +31,7 @@ | |
197 | * OTHER DEALINGS IN THE SOFTWARE. | |
198 | */ | |
199 | ||
200 | -#include <linux/config.h> | |
201 | + | |
202 | #include "drmP.h" | |
203 | ||
204 | typedef struct drm_mem_stats { | |
205 | diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/drm_memory.h X11-6.9.0/xc/extras/drm/linux-core/drm_memory.h | |
206 | --- X11-6.9.0.org/xc/extras/drm/linux-core/drm_memory.h 2005-10-18 04:24:08.000000000 +0200 | |
207 | +++ X11-6.9.0/xc/extras/drm/linux-core/drm_memory.h 2005-12-22 11:43:10.930963000 +0100 | |
208 | @@ -33,7 +33,7 @@ | |
209 | * OTHER DEALINGS IN THE SOFTWARE. | |
210 | */ | |
211 | ||
212 | -#include <linux/config.h> | |
213 | + | |
214 | #include <linux/highmem.h> | |
215 | #include <linux/vmalloc.h> | |
216 | #include "drmP.h" | |
217 | diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/drmP.h X11-6.9.0/xc/extras/drm/linux-core/drmP.h | |
218 | --- X11-6.9.0.org/xc/extras/drm/linux-core/drmP.h 2005-11-30 23:59:10.000000000 +0100 | |
219 | +++ X11-6.9.0/xc/extras/drm/linux-core/drmP.h 2005-12-22 11:43:10.930963000 +0100 | |
220 | @@ -41,7 +41,7 @@ | |
221 | * can build the DRM (part of PI DRI). 4/21/2000 S + B */ | |
222 | #include <asm/current.h> | |
223 | #endif /* __alpha__ */ | |
224 | -#include <linux/config.h> | |
225 | + | |
226 | #include <linux/module.h> | |
227 | #include <linux/kernel.h> | |
228 | #include <linux/miscdevice.h> | |
229 | diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/drm_scatter.c X11-6.9.0/xc/extras/drm/linux-core/drm_scatter.c | |
230 | --- X11-6.9.0.org/xc/extras/drm/linux-core/drm_scatter.c 2005-10-18 04:24:09.000000000 +0200 | |
231 | +++ X11-6.9.0/xc/extras/drm/linux-core/drm_scatter.c 2005-12-22 11:43:11.000963000 +0100 | |
232 | @@ -31,7 +31,7 @@ | |
233 | * DEALINGS IN THE SOFTWARE. | |
234 | */ | |
235 | ||
236 | -#include <linux/config.h> | |
237 | + | |
238 | #include <linux/vmalloc.h> | |
239 | ||
240 | #include "drmP.h" | |
241 | diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/drm_sysfs.c X11-6.9.0/xc/extras/drm/linux-core/drm_sysfs.c | |
242 | --- X11-6.9.0.org/xc/extras/drm/linux-core/drm_sysfs.c 2005-10-18 04:24:09.000000000 +0200 | |
243 | +++ X11-6.9.0/xc/extras/drm/linux-core/drm_sysfs.c 2005-12-22 11:43:10.870963000 +0100 | |
244 | @@ -11,7 +11,7 @@ | |
245 | * | |
246 | */ | |
247 | ||
248 | -#include <linux/config.h> | |
249 | + | |
250 | #include <linux/device.h> | |
251 | #include <linux/kdev_t.h> | |
252 | #include <linux/err.h> | |
253 | diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/ffb_drv.c X11-6.9.0/xc/extras/drm/linux-core/ffb_drv.c | |
254 | --- X11-6.9.0.org/xc/extras/drm/linux-core/ffb_drv.c 2005-10-18 04:24:09.000000000 +0200 | |
255 | +++ X11-6.9.0/xc/extras/drm/linux-core/ffb_drv.c 2005-12-22 11:43:10.980963000 +0100 | |
256 | @@ -4,7 +4,7 @@ | |
257 | * Copyright (C) 2000 David S. Miller (davem@redhat.com) | |
258 | */ | |
259 | ||
260 | -#include <linux/config.h> | |
261 | + | |
262 | #include <linux/sched.h> | |
263 | #include <linux/smp_lock.h> | |
264 | #include <asm/shmparam.h> | |
265 | diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/i810_drv.c X11-6.9.0/xc/extras/drm/linux-core/i810_drv.c | |
266 | --- X11-6.9.0.org/xc/extras/drm/linux-core/i810_drv.c 2005-10-18 04:24:09.000000000 +0200 | |
267 | +++ X11-6.9.0/xc/extras/drm/linux-core/i810_drv.c 2005-12-22 11:43:10.900963000 +0100 | |
268 | @@ -30,7 +30,7 @@ | |
269 | * Gareth Hughes <gareth@valinux.com> | |
270 | */ | |
271 | ||
272 | -#include <linux/config.h> | |
273 | + | |
274 | #include "drmP.h" | |
275 | #include "drm.h" | |
276 | #include "i810_drm.h" | |
277 | diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/i830_drv.c X11-6.9.0/xc/extras/drm/linux-core/i830_drv.c | |
278 | --- X11-6.9.0.org/xc/extras/drm/linux-core/i830_drv.c 2005-10-18 04:24:10.000000000 +0200 | |
279 | +++ X11-6.9.0/xc/extras/drm/linux-core/i830_drv.c 2005-12-22 11:43:10.950963000 +0100 | |
280 | @@ -32,7 +32,7 @@ | |
281 | * Keith Whitwell <keith@tungstengraphics.com> | |
282 | */ | |
283 | ||
284 | -#include <linux/config.h> | |
285 | + | |
286 | ||
287 | #include "drmP.h" | |
288 | #include "drm.h" | |
289 | diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/imagine_drv.c X11-6.9.0/xc/extras/drm/linux-core/imagine_drv.c | |
290 | --- X11-6.9.0.org/xc/extras/drm/linux-core/imagine_drv.c 2005-10-18 04:24:10.000000000 +0200 | |
291 | +++ X11-6.9.0/xc/extras/drm/linux-core/imagine_drv.c 2005-12-22 11:43:10.960963000 +0100 | |
292 | @@ -22,7 +22,7 @@ | |
293 | ||
294 | /* derived from tdfx_drv.c */ | |
295 | ||
296 | -#include <linux/config.h> | |
297 | + | |
298 | #include "drmP.h" | |
299 | #include "imagine_drv.h" | |
300 | ||
301 | diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/mach64_drv.c X11-6.9.0/xc/extras/drm/linux-core/mach64_drv.c | |
302 | --- X11-6.9.0.org/xc/extras/drm/linux-core/mach64_drv.c 2005-10-18 04:24:10.000000000 +0200 | |
303 | +++ X11-6.9.0/xc/extras/drm/linux-core/mach64_drv.c 2005-12-22 11:43:10.970963000 +0100 | |
304 | @@ -27,7 +27,7 @@ | |
305 | * Leif Delgass <ldelgass@retinalburn.net> | |
306 | */ | |
307 | ||
308 | -#include <linux/config.h> | |
309 | + | |
310 | #include "drmP.h" | |
311 | #include "drm.h" | |
312 | #include "mach64_drm.h" | |
313 | diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/mga_drv.c X11-6.9.0/xc/extras/drm/linux-core/mga_drv.c | |
314 | --- X11-6.9.0.org/xc/extras/drm/linux-core/mga_drv.c 2005-10-18 04:24:10.000000000 +0200 | |
315 | +++ X11-6.9.0/xc/extras/drm/linux-core/mga_drv.c 2005-12-22 11:43:11.000963000 +0100 | |
316 | @@ -29,7 +29,7 @@ | |
317 | * Gareth Hughes <gareth@valinux.com> | |
318 | */ | |
319 | ||
320 | -#include <linux/config.h> | |
321 | + | |
322 | #include "drmP.h" | |
323 | #include "drm.h" | |
324 | #include "mga_drm.h" | |
325 | diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/nv_drv.c X11-6.9.0/xc/extras/drm/linux-core/nv_drv.c | |
326 | --- X11-6.9.0.org/xc/extras/drm/linux-core/nv_drv.c 2005-10-18 04:24:10.000000000 +0200 | |
327 | +++ X11-6.9.0/xc/extras/drm/linux-core/nv_drv.c 2005-12-22 11:43:10.910963000 +0100 | |
328 | @@ -32,7 +32,7 @@ | |
329 | * Lars Knoll <lars@trolltech.com> | |
330 | */ | |
331 | ||
332 | -#include <linux/config.h> | |
333 | + | |
334 | #include "drmP.h" | |
335 | #include "nv_drv.h" | |
336 | ||
337 | diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/r128_drv.c X11-6.9.0/xc/extras/drm/linux-core/r128_drv.c | |
338 | --- X11-6.9.0.org/xc/extras/drm/linux-core/r128_drv.c 2005-10-18 04:24:10.000000000 +0200 | |
339 | +++ X11-6.9.0/xc/extras/drm/linux-core/r128_drv.c 2005-12-22 11:43:10.960963000 +0100 | |
340 | @@ -29,7 +29,7 @@ | |
341 | * Gareth Hughes <gareth@valinux.com> | |
342 | */ | |
343 | ||
344 | -#include <linux/config.h> | |
345 | + | |
346 | #include "drmP.h" | |
347 | #include "drm.h" | |
348 | #include "r128_drm.h" | |
349 | diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/radeon_drv.c X11-6.9.0/xc/extras/drm/linux-core/radeon_drv.c | |
350 | --- X11-6.9.0.org/xc/extras/drm/linux-core/radeon_drv.c 2005-10-18 04:24:10.000000000 +0200 | |
351 | +++ X11-6.9.0/xc/extras/drm/linux-core/radeon_drv.c 2005-12-22 11:43:10.980963000 +0100 | |
352 | @@ -29,7 +29,7 @@ | |
353 | * OTHER DEALINGS IN THE SOFTWARE. | |
354 | */ | |
355 | ||
356 | -#include <linux/config.h> | |
357 | + | |
358 | #include "drmP.h" | |
359 | #include "drm.h" | |
360 | #include "radeon_drm.h" | |
361 | diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/savage_drv.c X11-6.9.0/xc/extras/drm/linux-core/savage_drv.c | |
362 | --- X11-6.9.0.org/xc/extras/drm/linux-core/savage_drv.c 2005-10-18 04:24:10.000000000 +0200 | |
363 | +++ X11-6.9.0/xc/extras/drm/linux-core/savage_drv.c 2005-12-22 11:43:10.950963000 +0100 | |
364 | @@ -23,7 +23,7 @@ | |
365 | * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | |
366 | */ | |
367 | ||
368 | -#include <linux/config.h> | |
369 | + | |
370 | #include "drmP.h" | |
371 | #include "savage_drm.h" | |
372 | #include "savage_drv.h" | |
373 | diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/sis_drv.c X11-6.9.0/xc/extras/drm/linux-core/sis_drv.c | |
374 | --- X11-6.9.0.org/xc/extras/drm/linux-core/sis_drv.c 2005-10-18 04:24:10.000000000 +0200 | |
375 | +++ X11-6.9.0/xc/extras/drm/linux-core/sis_drv.c 2005-12-22 11:43:11.020963000 +0100 | |
376 | @@ -25,7 +25,7 @@ | |
377 | * | |
378 | */ | |
379 | ||
380 | -#include <linux/config.h> | |
381 | + | |
382 | #include "drmP.h" | |
383 | #include "sis_drm.h" | |
384 | #include "sis_drv.h" | |
385 | diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/tdfx_drv.c X11-6.9.0/xc/extras/drm/linux-core/tdfx_drv.c | |
386 | --- X11-6.9.0.org/xc/extras/drm/linux-core/tdfx_drv.c 2005-10-18 04:24:10.000000000 +0200 | |
387 | +++ X11-6.9.0/xc/extras/drm/linux-core/tdfx_drv.c 2005-12-22 11:43:11.010963000 +0100 | |
388 | @@ -30,7 +30,7 @@ | |
389 | * Gareth Hughes <gareth@valinux.com> | |
390 | */ | |
391 | ||
392 | -#include <linux/config.h> | |
393 | + | |
394 | #include "drmP.h" | |
395 | #include "tdfx_drv.h" | |
396 | ||
397 | diff -ur X11-6.9.0.org/xc/extras/drm/shared/drm.h X11-6.9.0/xc/extras/drm/shared/drm.h | |
398 | --- X11-6.9.0.org/xc/extras/drm/shared/drm.h 2005-07-27 02:15:46.000000000 +0200 | |
399 | +++ X11-6.9.0/xc/extras/drm/shared/drm.h 2005-12-22 11:43:11.400963000 +0100 | |
400 | @@ -64,7 +64,7 @@ | |
85ac0369 | 401 | |
402 | #if defined(__linux__) | |
48a3a761 | 403 | #if defined(__KERNEL__) |
85ac0369 | 404 | -#include <linux/config.h> |
405 | + | |
48a3a761 | 406 | #endif |
85ac0369 | 407 | #include <asm/ioctl.h> /* For _IO* macros */ |
408 | #define DRM_IOCTL_NR(n) _IOC_NR(n) | |
48a3a761 AM |
409 | diff -ur X11-6.9.0.org/xc/extras/drm/shared/via_drv.c X11-6.9.0/xc/extras/drm/shared/via_drv.c |
410 | --- X11-6.9.0.org/xc/extras/drm/shared/via_drv.c 2005-06-15 20:31:59.000000000 +0200 | |
411 | +++ X11-6.9.0/xc/extras/drm/shared/via_drv.c 2005-12-22 11:43:11.350963000 +0100 | |
412 | @@ -22,7 +22,7 @@ | |
85ac0369 | 413 | * DEALINGS IN THE SOFTWARE. |
414 | */ | |
48a3a761 | 415 | |
85ac0369 | 416 | -#include <linux/config.h> |
417 | + | |
418 | #include "via.h" | |
419 | #include "drmP.h" | |
420 | #include "via_drm.h" | |
48a3a761 AM |
421 | diff -ur X11-6.9.0.org/xc/extras/drm/shared-core/drm.h X11-6.9.0/xc/extras/drm/shared-core/drm.h |
422 | --- X11-6.9.0.org/xc/extras/drm/shared-core/drm.h 2005-10-18 04:24:10.000000000 +0200 | |
423 | +++ X11-6.9.0/xc/extras/drm/shared-core/drm.h 2005-12-22 11:43:10.740963000 +0100 | |
424 | @@ -70,7 +70,7 @@ | |
425 | ||
426 | #if defined(__linux__) | |
427 | #if defined(__KERNEL__) | |
428 | -#include <linux/config.h> | |
429 | + | |
430 | #endif | |
431 | #include <asm/ioctl.h> /* For _IO* macros */ | |
432 | #define DRM_IOCTL_NR(n) _IOC_NR(n) | |
433 | diff -ur X11-6.9.0.org/xc/extras/drm/shared-core/via_drv.c X11-6.9.0/xc/extras/drm/shared-core/via_drv.c | |
434 | --- X11-6.9.0.org/xc/extras/drm/shared-core/via_drv.c 2005-10-18 04:24:15.000000000 +0200 | |
435 | +++ X11-6.9.0/xc/extras/drm/shared-core/via_drv.c 2005-12-22 11:43:10.710963000 +0100 | |
436 | @@ -22,7 +22,7 @@ | |
437 | * DEALINGS IN THE SOFTWARE. | |
438 | */ | |
439 | ||
440 | -#include <linux/config.h> | |
441 | + | |
442 | #include "drmP.h" | |
443 | #include "via_drm.h" | |
444 | #include "via_drv.h" | |
445 | diff -ur X11-6.9.0.org/xc/programs/Xserver/hw/xfree86/drivers/sis/init301.h X11-6.9.0/xc/programs/Xserver/hw/xfree86/drivers/sis/init301.h | |
446 | --- X11-6.9.0.org/xc/programs/Xserver/hw/xfree86/drivers/sis/init301.h 2005-09-18 01:07:17.000000000 +0200 | |
447 | +++ X11-6.9.0/xc/programs/Xserver/hw/xfree86/drivers/sis/init301.h 2005-12-22 11:43:11.410963000 +0100 | |
448 | @@ -67,7 +67,7 @@ | |
85ac0369 | 449 | #ifdef SIS_CP |
450 | #undef SIS_CP | |
451 | #endif | |
452 | -#include <linux/config.h> | |
453 | + | |
454 | #include <linux/version.h> | |
85ac0369 | 455 | #include <linux/types.h> |
48a3a761 AM |
456 | #include <asm/io.h> |
457 | diff -ur X11-6.9.0.org/xc/programs/Xserver/hw/xfree86/drivers/sis/init.h X11-6.9.0/xc/programs/Xserver/hw/xfree86/drivers/sis/init.h | |
458 | --- X11-6.9.0.org/xc/programs/Xserver/hw/xfree86/drivers/sis/init.h 2005-09-07 21:44:14.000000000 +0200 | |
459 | +++ X11-6.9.0/xc/programs/Xserver/hw/xfree86/drivers/sis/init.h 2005-12-22 11:43:11.440963000 +0100 | |
460 | @@ -73,7 +73,7 @@ | |
85ac0369 | 461 | #ifdef SIS_CP |
462 | #undef SIS_CP | |
463 | #endif | |
464 | -#include <linux/config.h> | |
465 | + | |
466 | #include <linux/version.h> | |
467 | #include <linux/types.h> | |
468 | #include <asm/io.h> | |
48a3a761 AM |
469 | diff -ur X11-6.9.0.org/xc/programs/Xserver/hw/xfree86/drivers/sis/osdef.h X11-6.9.0/xc/programs/Xserver/hw/xfree86/drivers/sis/osdef.h |
470 | --- X11-6.9.0.org/xc/programs/Xserver/hw/xfree86/drivers/sis/osdef.h 2005-07-04 12:57:08.000000000 +0200 | |
471 | +++ X11-6.9.0/xc/programs/Xserver/hw/xfree86/drivers/sis/osdef.h 2005-12-22 11:43:11.450963000 +0100 | |
472 | @@ -90,7 +90,7 @@ | |
85ac0369 | 473 | /**********************************************************************/ |
474 | ||
48a3a761 | 475 | #ifdef SIS_LINUX_KERNEL |
85ac0369 | 476 | -#include <linux/config.h> |
477 | + | |
478 | #include <linux/version.h> | |
479 | ||
480 | #ifdef CONFIG_FB_SIS_300 |