3 files changed, 1 insertions, 42 deletions

diff --git a/drivers/char/drm/drm.h b/drivers/char/drm/drm.h
index 2d6f2d0bd02b..82fb3d0d2785 100644
--- a/drivers/char/drm/drm.h
+++ b/drivers/char/drm/drm.h
@@ -63,27 +63,9 @@
 #define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
 #endif
 
-#define XFREE86_VERSION(major,minor,patch,snap) \
-                ((major << 16) | (minor << 8) | patch)
-
-#ifndef CONFIG_XFREE86_VERSION
-#define CONFIG_XFREE86_VERSION XFREE86_VERSION(4,1,0,0)
-#endif
-
-#if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0)
-#define DRM_PROC_DEVICES "/proc/devices"
-#define DRM_PROC_MISC    "/proc/misc"
-#define DRM_PROC_DRM     "/proc/drm"
-#define DRM_DEV_DRM      "/dev/drm"
-#define DRM_DEV_MODE     (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP)
-#define DRM_DEV_UID      0
-#define DRM_DEV_GID      0
-#endif
-
-#if CONFIG_XFREE86_VERSION >= XFREE86_VERSION(4,1,0,0)
 #define DRM_MAJOR       226
 #define DRM_MAX_MINOR   15
-#endif
+
 #define DRM_NAME        "drm"     /**< Name in kernel, /dev, and /proc */
 #define DRM_MIN_ORDER   5         /**< At least 2^5 bytes = 32 bytes */
 #define DRM_MAX_ORDER   22        /**< Up to 2^22 bytes = 4MB */
diff --git a/drivers/char/drm/i810_drm.h b/drivers/char/drm/i810_drm.h
index 614977dbce45..7a10bb6f2c0f 100644
--- a/drivers/char/drm/i810_drm.h
+++ b/drivers/char/drm/i810_drm.h
@@ -102,13 +102,8 @@ typedef enum _drm_i810_init_func {
 /* This is the init structure after v1.2 */
 typedef struct _drm_i810_init {
         drm_i810_init_func_t func;
-#if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0)
-        int ring_map_idx;
-        int buffer_map_idx;
-#else
         unsigned int mmio_offset;
         unsigned int buffers_offset;
-#endif
         int sarea_priv_offset;
         unsigned int ring_start;
         unsigned int ring_end;
diff --git a/drivers/char/drm/r128_drm.h b/drivers/char/drm/r128_drm.h
index e94a39c6e327..8d8878b55f55 100644
--- a/drivers/char/drm/r128_drm.h
+++ b/drivers/char/drm/r128_drm.h
@@ -222,11 +222,7 @@ typedef struct drm_r128_init {
                 R128_INIT_CCE = 0x01,
                 R128_CLEANUP_CCE = 0x02
         } func;
-#if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0)
-        int sarea_priv_offset;
-#else
         unsigned long sarea_priv_offset;
-#endif
         int is_pci;
         int cce_mode;
         int cce_secure;
@@ -240,21 +236,12 @@ typedef struct drm_r128_init {
         unsigned int depth_offset, depth_pitch;
         unsigned int span_offset;
 
-#if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0)
-        unsigned int fb_offset;
-        unsigned int mmio_offset;
-        unsigned int ring_offset;
-        unsigned int ring_rptr_offset;
-        unsigned int buffers_offset;
-        unsigned int agp_textures_offset;
-#else
         unsigned long fb_offset;
         unsigned long mmio_offset;
         unsigned long ring_offset;
         unsigned long ring_rptr_offset;
         unsigned long buffers_offset;
         unsigned long agp_textures_offset;
-#endif
 } drm_r128_init_t;
 
 typedef struct drm_r128_cce_stop {
@@ -264,15 +251,10 @@ typedef struct drm_r128_cce_stop {
 
 typedef struct drm_r128_clear {
         unsigned int flags;
-#if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0)
-        int x, y, w, h;
-#endif
         unsigned int clear_color;
         unsigned int clear_depth;
-#if CONFIG_XFREE86_VERSION >= XFREE86_VERSION(4,1,0,0)
         unsigned int color_mask;
         unsigned int depth_mask;
-#endif
 } drm_r128_clear_t;
 
 typedef struct drm_r128_vertex {