The Linux 2.6.9 (and earlier) fops structure does not contain a

    .compat_ioctl field. This change makes the DRM build on those kernels.
Signed-off-by: Ian Romanick <idr@us.ibm.com>

diff --git a/linux-core/mga_drv.c b/linux-core/mga_drv.c
index 4dc5603..1a55992 100644 (file)
--- a/linux-core/mga_drv.c
+++ b/linux-core/mga_drv.c
@@ -75,7 +75,7 @@ static struct drm_driver driver = {
                .mmap = drm_mmap,
                .poll = drm_poll,
                .fasync = drm_fasync,
-#ifdef CONFIG_COMPAT
+#if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
                .compat_ioctl = mga_compat_ioctl,
 #endif
                },

diff --git a/linux-core/r128_drv.c b/linux-core/r128_drv.c
index b6cff4d..a722328 100644 (file)
--- a/linux-core/r128_drv.c
+++ b/linux-core/r128_drv.c
@@ -71,7 +71,7 @@ static struct drm_driver driver = {
                .mmap = drm_mmap,
                .poll = drm_poll,
                .fasync = drm_fasync,
-#ifdef CONFIG_COMPAT
+#if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
                .compat_ioctl = r128_compat_ioctl,
 #endif
                },

diff --git a/linux-core/radeon_drv.c b/linux-core/radeon_drv.c
index 52e5017..57c24f4 100644 (file)
--- a/linux-core/radeon_drv.c
+++ b/linux-core/radeon_drv.c
@@ -93,7 +93,7 @@ static struct drm_driver driver = {
                .mmap = drm_mmap,
                .poll = drm_poll,
                .fasync = drm_fasync,
-#ifdef CONFIG_COMPAT
+#if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
                .compat_ioctl = radeon_compat_ioctl,
 #endif
                },