diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2008-07-31 15:18:32 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2008-07-31 15:18:32 -0400 |
| commit | 5052e966ec7fe5146c2d73b90482003619add5da (patch) | |
| tree | a48e771871fd64a2892f5ce75e6e309b03db5e06 /linux-core/xgi_fb.c | |
| parent | 6d4e147480a334d32fa59c7fde53e10d7ab6e106 (diff) | |
| parent | 95c02743c96ca9e959f68a6e942206bdfadae53a (diff) | |
Merge commit 'origin/master' into modesetting-gem
Conflicts:
linux-core/Makefile.kernel
linux-core/ati_pcigart.c
linux-core/drm_compat.h
linux-core/drm_irq.c
linux-core/drm_lock.c
linux-core/i915_drv.c
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
shared-core/nouveau_mem.c
shared-core/radeon_cp.c
shared-core/radeon_drv.h
Diffstat (limited to 'linux-core/xgi_fb.c')
| -rw-r--r-- | linux-core/xgi_fb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-core/xgi_fb.c b/linux-core/xgi_fb.c index 3f50fe8f..e793bd3f 100644 --- a/linux-core/xgi_fb.c +++ b/linux-core/xgi_fb.c @@ -93,7 +93,7 @@ int xgi_alloc_ioctl(struct drm_device * dev, void * data, } -int xgi_free(struct xgi_info * info, unsigned long index, +int xgi_free(struct xgi_info * info, unsigned int index, struct drm_file * filp) { int err; @@ -111,7 +111,7 @@ int xgi_free_ioctl(struct drm_device * dev, void * data, { struct xgi_info *info = dev->dev_private; - return xgi_free(info, *(unsigned long *) data, filp); + return xgi_free(info, *(unsigned int *) data, filp); } |