summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2005-06-29 11:56:42 +0000
committerDave Airlie <airlied@linux.ie>2005-06-29 11:56:42 +0000
commit62b55eb433a211c565367b8ae717666e0acaf8fe (patch)
treece755b56a6c60e48b2f634650e9b20aa658304c5 /linux-core
parent2b427bee9bb4de9dba6ab96b68c66d22144669a5 (diff)
make r128/mga compile properly on sparc cross-compiler
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/mga_ioc32.c2
-rw-r--r--linux-core/r128_ioc32.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/linux-core/mga_ioc32.c b/linux-core/mga_ioc32.c
index f5be4a5e..390bb2e6 100644
--- a/linux-core/mga_ioc32.c
+++ b/linux-core/mga_ioc32.c
@@ -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,
};
diff --git a/linux-core/r128_ioc32.c b/linux-core/r128_ioc32.c
index aa60d475..b34a0ce2 100644
--- a/linux-core/r128_ioc32.c
+++ b/linux-core/r128_ioc32.c
@@ -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)))