diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-07-26 16:58:28 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-07-26 16:58:28 -0700 |
| commit | c561cb4650dc5895acfb3ae00c7ff455be31a860 (patch) | |
| tree | 65b21097253d216e0385778597031ae288e34023 /shared-core/nv50_mc.c | |
| parent | 2bafeb673f14b1e3799bf00817138c0b8211635e (diff) | |
| parent | 4175dd818110bd10d6d09190d30c271e89202b18 (diff) | |
Merge branch 'master' of ssh+git://git.freedesktop.org/git/mesa/drm into xgi-0-0-2
Conflicts:
linux-core/drmP.h
linux-core/drm_scatter.c
Diffstat (limited to 'shared-core/nv50_mc.c')
| -rw-r--r-- | shared-core/nv50_mc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/shared-core/nv50_mc.c b/shared-core/nv50_mc.c index 7f7537f0..952dea9f 100644 --- a/shared-core/nv50_mc.c +++ b/shared-core/nv50_mc.c @@ -29,14 +29,14 @@ #include "nouveau_drv.h" int -nv50_mc_init(drm_device_t *dev) +nv50_mc_init(struct drm_device *dev) { - drm_nouveau_private_t *dev_priv = dev->dev_private; + struct drm_nouveau_private *dev_priv = dev->dev_private; NV_WRITE(NV03_PMC_ENABLE, 0xFFFFFFFF); return 0; } -void nv50_mc_takedown(drm_device_t *dev) +void nv50_mc_takedown(struct drm_device *dev) { } |