diff options
| author | Eric Anholt <eric@anholt.net> | 2008-05-30 14:42:08 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-05-30 14:42:08 -0700 |
| commit | 461bfa3da6f85b85c21cd84f81bb4eefa5481418 (patch) | |
| tree | 33e91c8cd024f67922670f9ed6565ceda1e4f3b5 /bsd-core/drm_sysctl.c | |
| parent | 50bce2bc625deb439dd61f504496dddd0cd4f572 (diff) | |
| parent | 6e8a2cff66ac0d6afaf9bb233bc81449c2014078 (diff) | |
Merge commit 'origin/master' into drm-gem
Conflicts:
linux-core/Makefile.kernel
shared-core/i915_drv.h
shared-core/nouveau_state.c
Diffstat (limited to 'bsd-core/drm_sysctl.c')
| -rw-r--r-- | bsd-core/drm_sysctl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bsd-core/drm_sysctl.c b/bsd-core/drm_sysctl.c index 3de5b8ae..a6adf0fc 100644 --- a/bsd-core/drm_sysctl.c +++ b/bsd-core/drm_sysctl.c @@ -52,7 +52,7 @@ struct drm_sysctl_info { char name[2]; }; -int drm_sysctl_init(drm_device_t *dev) +int drm_sysctl_init(struct drm_device *dev) { struct drm_sysctl_info *info; struct sysctl_oid *oid; @@ -106,7 +106,7 @@ int drm_sysctl_init(drm_device_t *dev) return 0; } -int drm_sysctl_cleanup(drm_device_t *dev) +int drm_sysctl_cleanup(struct drm_device *dev) { int error; error = sysctl_ctx_free( &dev->sysctl->ctx ); @@ -127,7 +127,7 @@ do { \ static int drm_name_info DRM_SYSCTL_HANDLER_ARGS { - drm_device_t *dev = arg1; + struct drm_device *dev = arg1; char buf[128]; int retcode; int hasunique = 0; @@ -152,7 +152,7 @@ done: static int drm_vm_info DRM_SYSCTL_HANDLER_ARGS { - drm_device_t *dev = arg1; + struct drm_device *dev = arg1; drm_local_map_t *map, *tempmaps; const char *types[] = { "FB", "REG", "SHM", "AGP", "SG" }; const char *type, *yesno; @@ -211,7 +211,7 @@ done: static int drm_bufs_info DRM_SYSCTL_HANDLER_ARGS { - drm_device_t *dev = arg1; + struct drm_device *dev = arg1; drm_device_dma_t *dma = dev->dma; drm_device_dma_t tempdma; int *templists; @@ -267,7 +267,7 @@ done: static int drm_clients_info DRM_SYSCTL_HANDLER_ARGS { - drm_device_t *dev = arg1; + struct drm_device *dev = arg1; drm_file_t *priv, *tempprivs; char buf[128]; int retcode; |