Fix build with -fno-common.

4 files changed, 7 insertions, 7 deletions

diff --git a/driver/xf86-video-geode/src/geode.h b/driver/xf86-video-geode/src/geode.h
index eb61c2853..1b144ff8e 100644
--- a/driver/xf86-video-geode/src/geode.h
+++ b/driver/xf86-video-geode/src/geode.h
@@ -343,7 +343,7 @@ typedef struct _geodeRec {
 
 /* option flags are self-explanatory */
 #ifdef HAVE_LX
-enum {
+enum LX_GeodeOpts {
     LX_OPTION_SW_CURSOR,
     LX_OPTION_HW_CURSOR,
     LX_OPTION_NOCOMPRESSION,
@@ -357,11 +357,11 @@ enum {
     LX_OPTION_FBSIZE,
     LX_OPTION_PANEL_MODE,
     LX_OPTION_DONT_PROGRAM
-} LX_GeodeOpts;
+};
 #endif
 
 #ifdef HAVE_GX
-enum {
+enum GX_GeodeOpts {
     GX_OPTION_SW_CURSOR,
     GX_OPTION_HW_CURSOR,
     GX_OPTION_NOCOMPRESSION,
@@ -378,7 +378,7 @@ enum {
     GX_OPTION_FBSIZE,
     GX_OPTION_PANEL_GEOMETRY,
     GX_OPTION_DONT_PROGRAM
-} GX_GeodeOpts;
+};
 #endif
 
 /* geode_dcon.c */
diff --git a/driver/xf86-video-geode/src/gx_video.c b/driver/xf86-video-geode/src/gx_video.c
index 0d3e1c5a4..7964d1789 100644
--- a/driver/xf86-video-geode/src/gx_video.c
+++ b/driver/xf86-video-geode/src/gx_video.c
@@ -112,7 +112,7 @@ void GXSetVideoPosition(int x, int y, int width, int height,
 
 extern void GXAccelSync(ScrnInfoPtr pScrni);
 
-int DeltaX, DeltaY;
+extern int DeltaX, DeltaY;
 
 unsigned long graphics_lut[256];
 static int lutflag = 0;
diff --git a/driver/xf86-video-geode/src/lx_driver.c b/driver/xf86-video-geode/src/lx_driver.c
index 8c61eae5e..48ac2a1b6 100644
--- a/driver/xf86-video-geode/src/lx_driver.c
+++ b/driver/xf86-video-geode/src/lx_driver.c
@@ -75,7 +75,7 @@
 
 extern OptionInfoRec LX_GeodeOptions[];
 
-unsigned char *XpressROMPtr;
+extern unsigned char *XpressROMPtr;
 
 static Bool
 LXSaveScreen(ScreenPtr pScrn, int mode)
diff --git a/driver/xf86-video-geode/src/panel.c b/driver/xf86-video-geode/src/panel.c
index 206fc7874..561d9e0a4 100644
--- a/driver/xf86-video-geode/src/panel.c
+++ b/driver/xf86-video-geode/src/panel.c
@@ -51,7 +51,7 @@
 #define PLATFORM_DORADO			1       /* Dorado + 9211 RevC           */
 #define PLATFORM_GX2BASED		1       /* Redcloud                             */
 
-unsigned char *XpressROMPtr;
+extern unsigned char *XpressROMPtr;
 
 #include "pnl_init.c"
 #include "pnl_bios.c"