diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-05-28 21:01:18 +0100 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-05-28 21:01:18 +0100 |
| commit | 3a3f39d144c47ce937d6924d344a9ad3d82a2db5 (patch) | |
| tree | 109faf867b2e5774d54fe9499dbfebd3f26f014f /bsd-core/sis_drv.c | |
| parent | 070755af3fecefb6b09e8ef98738e4926e4148a7 (diff) | |
| parent | 5b86823fa36513f521412a38c240cb18f02dcc9a (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Conflicts:
shared-core/i915_dma.c
shared-core/i915_drv.h
Diffstat (limited to 'bsd-core/sis_drv.c')
| -rw-r--r-- | bsd-core/sis_drv.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bsd-core/sis_drv.c b/bsd-core/sis_drv.c index 5b87d3a9..9f76a689 100644 --- a/bsd-core/sis_drv.c +++ b/bsd-core/sis_drv.c @@ -36,7 +36,7 @@ static drm_pci_id_list_t sis_pciidlist[] = { sis_PCI_IDS }; -static void sis_configure(drm_device_t *dev) +static void sis_configure(struct drm_device *dev) { dev->driver.buf_priv_size = 1; /* No dev_priv */ dev->driver.context_ctor = sis_init_context; @@ -66,9 +66,9 @@ sis_probe(device_t dev) static int sis_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)); sis_configure(dev); return drm_attach(nbdev, sis_pciidlist); } @@ -85,7 +85,7 @@ static device_method_t sis_methods[] = { static driver_t sis_driver = { "drm", sis_methods, - sizeof(drm_device_t) + sizeof(struct drm_device) }; extern devclass_t drm_devclass; @@ -100,7 +100,7 @@ MODULE_DEPEND(sisdrm, drm, 1, 1, 1); #ifdef _LKM CFDRIVER_DECL(sis, DV_TTY, NULL); #else -CFATTACH_DECL(sis, sizeof(drm_device_t), drm_probe, drm_attach, drm_detach, +CFATTACH_DECL(sis, sizeof(struct drm_device), drm_probe, drm_attach, drm_detach, drm_activate); #endif #endif |