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/tdfx_drv.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/tdfx_drv.c')
| -rw-r--r-- | bsd-core/tdfx_drv.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bsd-core/tdfx_drv.c b/bsd-core/tdfx_drv.c index 5eb56f83..6d4e74b0 100644 --- a/bsd-core/tdfx_drv.c +++ b/bsd-core/tdfx_drv.c @@ -41,7 +41,7 @@ static drm_pci_id_list_t tdfx_pciidlist[] = { tdfx_PCI_IDS }; -static void tdfx_configure(drm_device_t *dev) +static void tdfx_configure(struct drm_device *dev) { dev->driver.buf_priv_size = 1; /* No dev_priv */ @@ -67,9 +67,9 @@ tdfx_probe(device_t dev) static int tdfx_attach(device_t nbdev) { - drm_device_t *dev = device_get_softc(nbdev); + struct drm_device *dev = device_get_softc(nbdev); - bzero(dev, sizeof(drm_device_t)); + bzero(dev, sizeof(struct drm_device)); tdfx_configure(dev); return drm_attach(nbdev, tdfx_pciidlist); } @@ -86,7 +86,7 @@ static device_method_t tdfx_methods[] = { static driver_t tdfx_driver = { "drm", tdfx_methods, - sizeof(drm_device_t) + sizeof(struct drm_device) }; extern devclass_t drm_devclass; @@ -101,7 +101,7 @@ MODULE_DEPEND(tdfx, drm, 1, 1, 1); #ifdef _LKM CFDRIVER_DECL(tdfx, DV_TTY, NULL); #else -CFATTACH_DECL(tdfx, sizeof(drm_device_t), drm_probe, drm_attach, drm_detach, - drm_activate); +CFATTACH_DECL(tdfx, sizeof(struct drm_device), drm_probe, drm_attach, + drm_detach, drm_activate); #endif #endif |