diff options
Diffstat (limited to 'linux-core/i915_drv.c')
-rw-r--r-- | linux-core/i915_drv.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c index 77b48045..007c9b94 100644 --- a/linux-core/i915_drv.c +++ b/linux-core/i915_drv.c @@ -2,10 +2,10 @@ */ /************************************************************************** - * + * * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. * All Rights Reserved. - * + * **************************************************************************/ #include "drmP.h" @@ -65,7 +65,7 @@ static drm_ioctl_desc_t ioctls[] = { [DRM_IOCTL_NR(DRM_I915_CMDBUFFER)] = {i915_cmdbuffer, 1, 0} }; -static struct drm_driver_fn driver_fn = { +static struct drm_driver driver = { .driver_features = DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | DRIVER_USE_MTRR | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED, @@ -94,10 +94,10 @@ static struct drm_driver_fn driver_fn = { static int probe(struct pci_dev *pdev, const struct pci_device_id *ent) { - return drm_probe(pdev, ent, &driver_fn); + return drm_probe(pdev, ent, &driver); } -static struct pci_driver driver = { +static struct pci_driver pci_driver = { .name = DRIVER_NAME, .id_table = pciidlist, .probe = probe, @@ -106,12 +106,12 @@ static struct pci_driver driver = { static int __init i915_init(void) { - return drm_init(&driver, pciidlist, &driver_fn); + return drm_init(&pci_driver, pciidlist, &driver); } static void __exit i915_exit(void) { - drm_exit(&driver); + drm_exit(&pci_driver); } module_init(i915_init); |