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/via_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/via_drv.c')
| -rw-r--r-- | bsd-core/via_drv.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bsd-core/via_drv.c b/bsd-core/via_drv.c index e12e1e99..1d784eed 100644 --- a/bsd-core/via_drv.c +++ b/bsd-core/via_drv.c @@ -39,7 +39,7 @@ static drm_pci_id_list_t via_pciidlist[] = { viadrv_PCI_IDS }; -static void via_configure(drm_device_t *dev) +static void via_configure(struct drm_device *dev) { dev->driver.buf_priv_size = 1; dev->driver.load = via_driver_load; @@ -79,9 +79,9 @@ via_probe(device_t dev) static int via_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)); via_configure(dev); return drm_attach(nbdev, via_pciidlist); } @@ -98,7 +98,7 @@ static device_method_t via_methods[] = { static driver_t via_driver = { "drm", via_methods, - sizeof(drm_device_t) + sizeof(struct drm_device) }; extern devclass_t drm_devclass; @@ -109,7 +109,7 @@ MODULE_DEPEND(via, drm, 1, 1, 1); #ifdef _LKM CFDRIVER_DECL(via, DV_TTY, NULL); #else -CFATTACH_DECL(via, sizeof(drm_device_t), drm_probe, drm_attach, drm_detach, +CFATTACH_DECL(via, sizeof(struct drm_device), drm_probe, drm_attach, drm_detach, drm_activate); #endif #endif |