diff options
author | Gareth Hughes <gareth@users.sourceforge.net> | 2000-12-23 06:47:58 +0000 |
---|---|---|
committer | Gareth Hughes <gareth@users.sourceforge.net> | 2000-12-23 06:47:58 +0000 |
commit | 3b89d5aaa53ddec0047d57631a12e236f9e7dec1 (patch) | |
tree | 6fbe07671b41044efb55b2c0c6d6fcd1e7a6c710 /linux-core/i810_drv.c | |
parent | 7c7885903a6fa3f561f3fe7ece28ac5b7aed8e7c (diff) |
Merge in XFree86 4.0.2 updates from trunk.ati-5-0-0-20001223-merge
Diffstat (limited to 'linux-core/i810_drv.c')
-rw-r--r-- | linux-core/i810_drv.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/linux-core/i810_drv.c b/linux-core/i810_drv.c index ed880c41..7152eac3 100644 --- a/linux-core/i810_drv.c +++ b/linux-core/i810_drv.c @@ -255,8 +255,7 @@ static int i810_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 i810_takedown(drm_device_t *dev) /* i810_init is called via init_module at module load time, or via * linux/init/main.c (this is not currently supported). */ -static int i810_init(void) +static int __init i810_init(void) { int retcode; drm_device_t *dev = &i810_device; @@ -397,7 +396,7 @@ static int i810_init(void) /* i810_cleanup is called via cleanup_module at module unload time. */ -static void i810_cleanup(void) +static void __exit i810_cleanup(void) { drm_device_t *dev = &i810_device; |