diff --git a/hw/xfree86/drivers/video/geode/src/cimarron.c b/hw/xfree86/drivers/video/geode/src/cimarron.c index 86036deac..130054fdb 100644 --- a/hw/xfree86/drivers/video/geode/src/cimarron.c +++ b/hw/xfree86/drivers/video/geode/src/cimarron.c @@ -28,10 +28,7 @@ * Base include file for the Cimarron library. This file should be modified * and included in any Cimarron-based project. */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/hw/xfree86/drivers/video/geode/src/durango.c b/hw/xfree86/drivers/video/geode/src/durango.c index 52da80e8a..ca9686298 100644 --- a/hw/xfree86/drivers/video/geode/src/durango.c +++ b/hw/xfree86/drivers/video/geode/src/durango.c @@ -27,10 +27,7 @@ been - remove the unnecessary #defines and routines, and concentrate on Linux for now. */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/hw/xfree86/drivers/video/geode/src/geode.h b/hw/xfree86/drivers/video/geode/src/geode.h index 33d49a72f..d9cc773e5 100644 --- a/hw/xfree86/drivers/video/geode/src/geode.h +++ b/hw/xfree86/drivers/video/geode/src/geode.h @@ -27,9 +27,8 @@ #ifndef _GEODE_H_ #define _GEODE_H_ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include + #include "geode_pcirename.h" #include "exa.h" diff --git a/hw/xfree86/drivers/video/geode/src/geode_common.c b/hw/xfree86/drivers/video/geode/src/geode_common.c index 7d85592c9..60856b9a0 100644 --- a/hw/xfree86/drivers/video/geode/src/geode_common.c +++ b/hw/xfree86/drivers/video/geode/src/geode_common.c @@ -25,10 +25,7 @@ */ /* We want to share as much code between GX and LX as we possibly can for obvious reasons */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include /* memcmp() */ #include diff --git a/hw/xfree86/drivers/video/geode/src/geode_dcon.c b/hw/xfree86/drivers/video/geode/src/geode_dcon.c index 20ca1944f..d8d5a082f 100644 --- a/hw/xfree86/drivers/video/geode/src/geode_dcon.c +++ b/hw/xfree86/drivers/video/geode/src/geode_dcon.c @@ -22,10 +22,7 @@ * contributors may be used to endorse or promote products derived from this * software without specific prior written permission. * */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include /* Includes that are used by all drivers */ #include diff --git a/hw/xfree86/drivers/video/geode/src/geode_ddc.c b/hw/xfree86/drivers/video/geode/src/geode_ddc.c index e6b685cde..3450a9d73 100644 --- a/hw/xfree86/drivers/video/geode/src/geode_ddc.c +++ b/hw/xfree86/drivers/video/geode/src/geode_ddc.c @@ -22,10 +22,7 @@ * contributors may be used to endorse or promote products derived from this * software without specific prior written permission. * */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include "xf86.h" #include "xf86Modes.h" diff --git a/hw/xfree86/drivers/video/geode/src/geode_driver.c b/hw/xfree86/drivers/video/geode/src/geode_driver.c index e7bf9e04c..5e9295565 100644 --- a/hw/xfree86/drivers/video/geode/src/geode_driver.c +++ b/hw/xfree86/drivers/video/geode/src/geode_driver.c @@ -34,10 +34,7 @@ * Project: Amd Xfree Frame buffer device driver. * */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include /* Includes that are used by all drivers */ #include "xf86.h" diff --git a/hw/xfree86/drivers/video/geode/src/geode_msr.c b/hw/xfree86/drivers/video/geode/src/geode_msr.c index 2fbd425bd..7f7fe3a9c 100644 --- a/hw/xfree86/drivers/video/geode/src/geode_msr.c +++ b/hw/xfree86/drivers/video/geode/src/geode_msr.c @@ -23,10 +23,7 @@ * contributors may be used to endorse or promote products derived from this * software without specific prior written permission. */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/hw/xfree86/drivers/video/geode/src/gfx/gfx_msr.c b/hw/xfree86/drivers/video/geode/src/gfx/gfx_msr.c index b1a8a2fba..b8c660630 100644 --- a/hw/xfree86/drivers/video/geode/src/gfx/gfx_msr.c +++ b/hw/xfree86/drivers/video/geode/src/gfx/gfx_msr.c @@ -35,10 +35,7 @@ * gfx_msr_read * gfx_msr_write * */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include /* INCLUDE SUPPORT FOR REDCLOUD, IF SPECIFIED */ diff --git a/hw/xfree86/drivers/video/geode/src/gx_cursor.c b/hw/xfree86/drivers/video/geode/src/gx_cursor.c index 8e1a6ac0d..fdd69bb5e 100644 --- a/hw/xfree86/drivers/video/geode/src/gx_cursor.c +++ b/hw/xfree86/drivers/video/geode/src/gx_cursor.c @@ -29,10 +29,7 @@ * * Project: Geode Xfree Frame buffer device driver. * */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include "xf86.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/drivers/video/geode/src/gx_driver.c b/hw/xfree86/drivers/video/geode/src/gx_driver.c index dd788631c..9a1830350 100644 --- a/hw/xfree86/drivers/video/geode/src/gx_driver.c +++ b/hw/xfree86/drivers/video/geode/src/gx_driver.c @@ -26,10 +26,7 @@ * contributors may be used to endorse or promote products derived from this * software without specific prior written permission. */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/hw/xfree86/drivers/video/geode/src/gx_exa.c b/hw/xfree86/drivers/video/geode/src/gx_exa.c index ba1a112d2..111a2d76b 100644 --- a/hw/xfree86/drivers/video/geode/src/gx_exa.c +++ b/hw/xfree86/drivers/video/geode/src/gx_exa.c @@ -32,10 +32,7 @@ /* #undef OPT_ACCEL */ -/* Xfree86 header files */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include "vgaHW.h" #include "xf86.h" diff --git a/hw/xfree86/drivers/video/geode/src/gx_randr.c b/hw/xfree86/drivers/video/geode/src/gx_randr.c index d72b39506..34c36280e 100644 --- a/hw/xfree86/drivers/video/geode/src/gx_randr.c +++ b/hw/xfree86/drivers/video/geode/src/gx_randr.c @@ -25,10 +25,7 @@ * contributors may be used to endorse or promote products derived from this * software without specific prior written permission. */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include "xf86.h" #include "xf86Modes.h" diff --git a/hw/xfree86/drivers/video/geode/src/gx_regacc.c b/hw/xfree86/drivers/video/geode/src/gx_regacc.c index c7ba64aa3..a481345ce 100644 --- a/hw/xfree86/drivers/video/geode/src/gx_regacc.c +++ b/hw/xfree86/drivers/video/geode/src/gx_regacc.c @@ -36,10 +36,7 @@ * It should not be recopied with new versions of Durango unless the * developer is willing to tune the file again for the specific project. * */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include "gfx_rtns.h" #include "gfx_defs.h" diff --git a/hw/xfree86/drivers/video/geode/src/gx_rotate.c b/hw/xfree86/drivers/video/geode/src/gx_rotate.c index 435b9f0a2..01c39f483 100644 --- a/hw/xfree86/drivers/video/geode/src/gx_rotate.c +++ b/hw/xfree86/drivers/video/geode/src/gx_rotate.c @@ -22,10 +22,7 @@ * contributors may be used to endorse or promote products derived from this * software without specific prior written permission. */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include "xf86.h" #include "shadow.h" diff --git a/hw/xfree86/drivers/video/geode/src/gx_vga.c b/hw/xfree86/drivers/video/geode/src/gx_vga.c index dc570a8e8..220571816 100644 --- a/hw/xfree86/drivers/video/geode/src/gx_vga.c +++ b/hw/xfree86/drivers/video/geode/src/gx_vga.c @@ -28,10 +28,7 @@ * Since this file is for the first generation graphics unit, it interfaces * to SoftVGA registers. It works for both VSA1 and VSA2. * */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/hw/xfree86/drivers/video/geode/src/gx_video.c b/hw/xfree86/drivers/video/geode/src/gx_video.c index 1813fc401..d726575dc 100644 --- a/hw/xfree86/drivers/video/geode/src/gx_video.c +++ b/hw/xfree86/drivers/video/geode/src/gx_video.c @@ -35,10 +35,7 @@ * code to allocate offscreen memory from EXA - is borrowed from Radeon */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/hw/xfree86/drivers/video/geode/src/lx_cursor.c b/hw/xfree86/drivers/video/geode/src/lx_cursor.c index fe1149a89..e788e230d 100644 --- a/hw/xfree86/drivers/video/geode/src/lx_cursor.c +++ b/hw/xfree86/drivers/video/geode/src/lx_cursor.c @@ -22,10 +22,7 @@ * contributors may be used to endorse or promote products derived from this * software without specific prior written permission. * */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include "xf86.h" #include "xf86i2c.h" diff --git a/hw/xfree86/drivers/video/geode/src/lx_display.c b/hw/xfree86/drivers/video/geode/src/lx_display.c index 50418455c..927784d36 100644 --- a/hw/xfree86/drivers/video/geode/src/lx_display.c +++ b/hw/xfree86/drivers/video/geode/src/lx_display.c @@ -22,10 +22,7 @@ * contributors may be used to endorse or promote products derived from this * software without specific prior written permission. */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include "xf86.h" #include "geode.h" diff --git a/hw/xfree86/drivers/video/geode/src/lx_driver.c b/hw/xfree86/drivers/video/geode/src/lx_driver.c index fca019e1e..799d06c9f 100644 --- a/hw/xfree86/drivers/video/geode/src/lx_driver.c +++ b/hw/xfree86/drivers/video/geode/src/lx_driver.c @@ -26,10 +26,7 @@ * contributors may be used to endorse or promote products derived from this * software without specific prior written permission. */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/hw/xfree86/drivers/video/geode/src/lx_exa.c b/hw/xfree86/drivers/video/geode/src/lx_exa.c index 5e19b9a8f..72a21d071 100644 --- a/hw/xfree86/drivers/video/geode/src/lx_exa.c +++ b/hw/xfree86/drivers/video/geode/src/lx_exa.c @@ -31,10 +31,7 @@ */ /* To support PictOptAdd with a mask */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include "xf86.h" #include "exa.h" diff --git a/hw/xfree86/drivers/video/geode/src/lx_memory.c b/hw/xfree86/drivers/video/geode/src/lx_memory.c index 050f08858..85806f1a0 100644 --- a/hw/xfree86/drivers/video/geode/src/lx_memory.c +++ b/hw/xfree86/drivers/video/geode/src/lx_memory.c @@ -22,9 +22,7 @@ * contributors may be used to endorse or promote products derived from this * software without specific prior written permission. */ -#if HAVE_CONFIG_H -#include "config.h" -#endif +#include #include "xf86.h" #include "geode.h" diff --git a/hw/xfree86/drivers/video/geode/src/lx_output.c b/hw/xfree86/drivers/video/geode/src/lx_output.c index fbe21ab03..cf551d44f 100644 --- a/hw/xfree86/drivers/video/geode/src/lx_output.c +++ b/hw/xfree86/drivers/video/geode/src/lx_output.c @@ -22,10 +22,7 @@ * contributors may be used to endorse or promote products derived from this * software without specific prior written permission. */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include "xf86.h" #include "X11/Xatom.h" diff --git a/hw/xfree86/drivers/video/geode/src/lx_panel.c b/hw/xfree86/drivers/video/geode/src/lx_panel.c index e7daac960..a7e24aedd 100644 --- a/hw/xfree86/drivers/video/geode/src/lx_panel.c +++ b/hw/xfree86/drivers/video/geode/src/lx_panel.c @@ -27,10 +27,7 @@ * VG Config Register (0x00) page 16 * VG FP Register (0x02) page 18 */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/hw/xfree86/drivers/video/geode/src/lx_video.c b/hw/xfree86/drivers/video/geode/src/lx_video.c index ea16ad453..d09e4c47d 100644 --- a/hw/xfree86/drivers/video/geode/src/lx_video.c +++ b/hw/xfree86/drivers/video/geode/src/lx_video.c @@ -28,10 +28,7 @@ Add back in double buffering? */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include diff --git a/hw/xfree86/drivers/video/geode/src/panel.c b/hw/xfree86/drivers/video/geode/src/panel.c index 206fc7874..2ba3402b0 100644 --- a/hw/xfree86/drivers/video/geode/src/panel.c +++ b/hw/xfree86/drivers/video/geode/src/panel.c @@ -29,10 +29,7 @@ * * Project: Geode Xfree Frame buffer device driver. * */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #ifdef __KERNEL__ diff --git a/hw/xfree86/drivers/video/geode/src/z4l.c b/hw/xfree86/drivers/video/geode/src/z4l.c index 4e11ff247..777bca57c 100644 --- a/hw/xfree86/drivers/video/geode/src/z4l.c +++ b/hw/xfree86/drivers/video/geode/src/z4l.c @@ -25,10 +25,7 @@ */ /* prototype Xv interface for lxv4l2 driver */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include