xfree86: drivers: geode: use xorg-config.h

Since we're in-tree now, we have to use dix-config.h instead of config.h Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2026-04-14 17:18:09 +00:00 · 2025-07-22 17:02:38 +02:00
parent 12a868817c
commit 4e7e3fcce9
27 changed files with 28 additions and 106 deletions
--- 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 <xorg-config.h>

 #include <stdint.h>

--- 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 <xorg-config.h>

 #include <unistd.h>
 #include <errno.h>
--- 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 <xorg-config.h>
+
 #include "geode_pcirename.h"

 #include "exa.h"
--- 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 <xorg-config.h>

 #include <string.h>             /* memcmp() */
 #include <unistd.h>
--- 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 <xorg-config.h>

 /* Includes that are used by all drivers */
 #include <xf86.h>
--- 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 <xorg-config.h>

 #include "xf86.h"
 #include "xf86Modes.h"
--- 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 <xorg-config.h>

 /* Includes that are used by all drivers */
 #include "xf86.h"
--- 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 <xorg-config.h>

 #include <stdio.h>
 #include <unistd.h>
--- 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 <xorg-config.h>

 /* INCLUDE SUPPORT FOR REDCLOUD, IF SPECIFIED */

--- 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 <xorg-config.h>

 #include "xf86.h"
 #include "xf86_OSproc.h"
--- 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 <xorg-config.h>

 #include <stdio.h>
 #include <fcntl.h>
--- 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 <xorg-config.h>

 #include "vgaHW.h"
 #include "xf86.h"
--- 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 <xorg-config.h>

 #include "xf86.h"
 #include "xf86Modes.h"
--- 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 <xorg-config.h>

 #include "gfx_rtns.h"
 #include "gfx_defs.h"
--- 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 <xorg-config.h>

 #include "xf86.h"
 #include "shadow.h"
--- 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 <xorg-config.h>

 #include <stdlib.h>
 #include <string.h>
--- 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 <xorg-config.h>

 #include <stdlib.h>
 #include <string.h>
--- 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 <xorg-config.h>

 #include "xf86.h"
 #include "xf86i2c.h"
--- 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 <xorg-config.h>

 #include "xf86.h"
 #include "geode.h"
--- 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 <xorg-config.h>

 #include <stdio.h>
 #include <string.h>
--- 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 <xorg-config.h>

 #include "xf86.h"
 #include "exa.h"
--- 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 <xorg-config.h>

 #include "xf86.h"
 #include "geode.h"
--- 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 <xorg-config.h>

 #include "xf86.h"
 #include "X11/Xatom.h"
--- 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 <xorg-config.h>

 #include <stdio.h>

--- 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 <xorg-config.h>

 #include <stdlib.h>
 #include <string.h>
--- 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 <xorg-config.h>

 #ifdef __KERNEL__

--- 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 <xorg-config.h>

 #include <sys/time.h>
 #include <sys/fcntl.h>