diff options
author | Dave Airlie <airlied@redhat.com> | 2007-11-22 17:17:06 +1100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2007-11-22 17:17:06 +1100 |
commit | a20587e3950f849deb1e723a0b4455a19f7b3fb8 (patch) | |
tree | de0a9d0b6558f3b359acf7985ddf4b8e7e83ee24 /shared-core/sis_drv.h | |
parent | 8fd8bf599b42b6caa062afabdfce7385d59a7695 (diff) | |
parent | 5dc5c36e624e5393b5427a159ad34e5fc358cc9f (diff) |
Merge branch 'origin' into modesetting-101
Conflicts:
linux-core/drmP.h
shared-core/i915_dma.c
shared-core/i915_drm.h
shared-core/radeon_drv.h
Diffstat (limited to 'shared-core/sis_drv.h')
-rw-r--r-- | shared-core/sis_drv.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/shared-core/sis_drv.h b/shared-core/sis_drv.h index a4a88fe1..db532f3c 100644 --- a/shared-core/sis_drv.h +++ b/shared-core/sis_drv.h @@ -84,8 +84,6 @@ extern int sis_final_context(struct drm_device * dev, int context); #endif - - extern struct drm_ioctl_desc sis_ioctls[]; extern int sis_max_ioctl; |