make r128/mga compile properly on sparc cross-compiler
authorDave Airlie <airlied@linux.ie>
Wed, 29 Jun 2005 11:56:42 +0000 (11:56 +0000)
committerDave Airlie <airlied@linux.ie>
Wed, 29 Jun 2005 11:56:42 +0000 (11:56 +0000)
linux-core/mga_ioc32.c
linux-core/r128_ioc32.c

index f5be4a5..390bb2e 100644 (file)
@@ -130,7 +130,7 @@ static int compat_mga_getparam(struct file *file, unsigned int cmd,
 }
 
 drm_ioctl_compat_t *mga_compat_ioctls[] = {
-       [DRM_MGA_DMA_INIT] = compat_mga_init,
+       [DRM_MGA_INIT] = compat_mga_init,
        [DRM_MGA_GETPARAM] = compat_mga_getparam,
 };
 
index aa60d47..b34a0ce 100644 (file)
@@ -36,7 +36,7 @@
 #include "drm.h"
 #include "r128_drm.h"
 
-typedef struct drm32_r128_init {
+typedef struct drm_r128_init32 {
        int func;
        unsigned int sarea_priv_offset;
        int is_pci;
@@ -58,7 +58,7 @@ typedef struct drm32_r128_init {
        unsigned int ring_rptr_offset;
        unsigned int buffers_offset;
        unsigned int agp_textures_offset;
-} drm32_r128_init_t;
+} drm_r128_init32_t;
 
 static int compat_r128_init(struct file *file, unsigned int cmd,
                            unsigned long arg)
@@ -140,7 +140,7 @@ typedef struct drm_r128_stipple32 {
 static int compat_r128_stipple(struct file *file, unsigned int cmd,
                               unsigned long arg)
 {
-       drm_r128_stipple32 stipple32;
+       drm_r128_stipple32_t stipple32;
        drm_r128_stipple_t __user *stipple;
 
        if (copy_from_user(&stipple32, (void __user *)arg, sizeof(stipple32)))