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/i810_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/i810_drv.c')
| -rw-r--r-- | linux/i810_drv.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/linux/i810_drv.c b/linux/i810_drv.c index ed880c41..7152eac3 100644 --- a/linux/i810_drv.c +++ b/linux/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; |