summaryrefslogtreecommitdiff
path: root/shared-core
diff options
context:
space:
mode:
Diffstat (limited to 'shared-core')
-rw-r--r--shared-core/via_drv.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/shared-core/via_drv.c b/shared-core/via_drv.c
index 68459830..994e9959 100644
--- a/shared-core/via_drv.c
+++ b/shared-core/via_drv.c
@@ -71,7 +71,7 @@ static drm_ioctl_desc_t ioctls[] = {
[DRM_IOCTL_NR(DRM_VIA_PCICMD)] = {via_pci_cmdbuffer, 1, 0}
};
-static struct drm_driver_fn driver_fn = {
+static struct drm_driver driver = {
.driver_features =
DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_HAVE_IRQ |
DRIVER_IRQ_SHARED | DRIVER_IRQ_VBL,
@@ -101,10 +101,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,
@@ -113,12 +113,12 @@ static struct pci_driver driver = {
static int __init via_init(void)
{
- return drm_init(&driver, pciidlist, &driver_fn);
+ return drm_init(&pci_driver, pciidlist, &driver);
}
static void __exit via_exit(void)
{
- drm_exit(&driver);
+ drm_exit(&pci_driver);
}
module_init(via_init);