diff options
| author | Gareth Hughes <gareth@users.sourceforge.net> | 2000-11-21 07:20:28 +0000 |
|---|---|---|
| committer | Gareth Hughes <gareth@users.sourceforge.net> | 2000-11-21 07:20:28 +0000 |
| commit | edfdc14215508f768dddfb210c1822bea427d672 (patch) | |
| tree | 0c093c717359e3703ed06869f04e1fc3e1430fa1 /linux-core/mga_drv.c | |
| parent | c071d03e7b5096dca1a73c589f7410d26b2e7f78 (diff) | |
Merge with latest trunk code. Now requires kernel 2.4.0-test11-pre5 orati-4-1-1-20001125-freeze
later.
Diffstat (limited to 'linux-core/mga_drv.c')
| -rw-r--r-- | linux-core/mga_drv.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/linux-core/mga_drv.c b/linux-core/mga_drv.c index 4aaac625..a6d2e570 100644 --- a/linux-core/mga_drv.c +++ b/linux-core/mga_drv.c @@ -255,8 +255,7 @@ static int mga_takedown(drm_device_t *dev) } dev->agp->memory = NULL; - if (dev->agp->acquired && drm_agp.release) - (*drm_agp.release)(); + if (dev->agp->acquired) _drm_agp_release(); dev->agp->acquired = 0; dev->agp->enabled = 0; @@ -338,7 +337,7 @@ static int mga_takedown(drm_device_t *dev) /* mga_init is called via init_module at module load time, or via * linux/init/main.c (this is not currently supported). */ -static int mga_init(void) +static int __init mga_init(void) { int retcode; drm_device_t *dev = &mga_device; @@ -398,7 +397,7 @@ static int mga_init(void) /* mga_cleanup is called via cleanup_module at module unload time. */ -static void mga_cleanup(void) +static void __exit mga_cleanup(void) { drm_device_t *dev = &mga_device; @@ -514,7 +513,7 @@ int mga_release(struct inode *inode, struct file *filp) if (dev->dev_private) ((drm_mga_private_t *)dev->dev_private) ->dispatch_status &= MGA_IN_DISPATCH; - + drm_lock_free(dev, &dev->lock.hw_lock->lock, _DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock)); |