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
5 * OTHER DEALINGS IN THE SOFTWARE.
8 -#include <linux/config.h>
12 typedef struct drm_mem_stats {
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
17 * OTHER DEALINGS IN THE SOFTWARE.
20 -#include <linux/config.h>
22 #include <linux/highmem.h>
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
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>
34 #include <linux/module.h>
35 #include <linux/kernel.h>
36 #include <linux/miscdevice.h>
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
41 * DEALINGS IN THE SOFTWARE.
44 -#include <linux/config.h>
46 #include <linux/vmalloc.h>
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
53 * Copyright (C) 2000 David S. Miller (davem@redhat.com)
56 -#include <linux/config.h>
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
65 * Gareth Hughes <gareth@valinux.com>
68 -#include <linux/config.h>
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
77 * Keith Whitwell <keith@tungstengraphics.com>
80 -#include <linux/config.h>
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
89 * Leif Delgass <ldelgass@retinalburn.net>
92 -#include <linux/config.h>
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
101 * Gareth Hughes <gareth@valinux.com>
104 -#include <linux/config.h>
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
113 * Gareth Hughes <gareth@valinux.com>
116 -#include <linux/config.h>
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
128 -#include <linux/config.h>
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
137 * DEALINGS IN THE SOFTWARE.
140 -#include <linux/config.h>
144 #include "savage_drm.h"
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
152 -#include <linux/config.h>
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
161 * Gareth Hughes <gareth@valinux.com>
164 -#include <linux/config.h>
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
173 * OTHER DEALINGS IN THE SOFTWARE.
176 -#include <linux/config.h>
178 #include <linux/highmem.h>
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
185 * OTHER DEALINGS IN THE SOFTWARE.
188 -#include <linux/config.h>
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
197 * OTHER DEALINGS IN THE SOFTWARE.
200 -#include <linux/config.h>
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
209 * OTHER DEALINGS IN THE SOFTWARE.
212 -#include <linux/config.h>
214 #include <linux/highmem.h>
215 #include <linux/vmalloc.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
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>
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
233 * DEALINGS IN THE SOFTWARE.
236 -#include <linux/config.h>
238 #include <linux/vmalloc.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
248 -#include <linux/config.h>
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
257 * Copyright (C) 2000 David S. Miller (davem@redhat.com)
260 -#include <linux/config.h>
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
269 * Gareth Hughes <gareth@valinux.com>
272 -#include <linux/config.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
281 * Keith Whitwell <keith@tungstengraphics.com>
284 -#include <linux/config.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
294 /* derived from tdfx_drv.c */
296 -#include <linux/config.h>
299 #include "imagine_drv.h"
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
305 * Leif Delgass <ldelgass@retinalburn.net>
308 -#include <linux/config.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
317 * Gareth Hughes <gareth@valinux.com>
320 -#include <linux/config.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
329 * Lars Knoll <lars@trolltech.com>
332 -#include <linux/config.h>
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
341 * Gareth Hughes <gareth@valinux.com>
344 -#include <linux/config.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
353 * OTHER DEALINGS IN THE SOFTWARE.
356 -#include <linux/config.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
365 * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
368 -#include <linux/config.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
380 -#include <linux/config.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
389 * Gareth Hughes <gareth@valinux.com>
392 -#include <linux/config.h>
395 #include "tdfx_drv.h"
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
402 #if defined(__linux__)
403 #if defined(__KERNEL__)
404 -#include <linux/config.h>
407 #include <asm/ioctl.h> /* For _IO* macros */
408 #define DRM_IOCTL_NR(n) _IOC_NR(n)
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
413 * DEALINGS IN THE SOFTWARE.
416 -#include <linux/config.h>
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
426 #if defined(__linux__)
427 #if defined(__KERNEL__)
428 -#include <linux/config.h>
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
437 * DEALINGS IN THE SOFTWARE.
440 -#include <linux/config.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
452 -#include <linux/config.h>
454 #include <linux/version.h>
455 #include <linux/types.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
464 -#include <linux/config.h>
466 #include <linux/version.h>
467 #include <linux/types.h>
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
473 /**********************************************************************/
475 #ifdef SIS_LINUX_KERNEL
476 -#include <linux/config.h>
478 #include <linux/version.h>
480 #ifdef CONFIG_FB_SIS_300