diff options
| author | Rik Faith <faith@alephnull.com> | 2000-11-15 15:47:51 +0000 |
|---|---|---|
| committer | Rik Faith <faith@alephnull.com> | 2000-11-15 15:47:51 +0000 |
| commit | 679531e1669085115bac5f6fc982d54a4a9608e8 (patch) | |
| tree | fb11ac227a9c2b02cdca70210ec86716892b66ca /linux-core/i810_drv.c | |
| parent | 0636342ef84da23f30b838b4f933e3aa15d5c2ce (diff) | |
Sync with Linux 2.4.0-test11-pre5 Provide backward compatibility tested
against 2.2.18pre21
As usual, since all 2.4.0-test* kernels set LINUX_VERSION_CODE to the same
value, if you are running a 2.4.0-test kernel, you MUST be running
2.4.0-test11-pre4 or later (although anything after 2.4.0-test11-pre1
should work fine -- I tested with pre4/pre5). I expect 2.2.x support to
continue to work for all recent kernels, but I tested with 2.2.18pre21
-- we use the old intermodule symbol communication for 2.2.x kernels,
so they should all continue to work.
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; |