summaryrefslogtreecommitdiff
path: root/linux-core/sis_drv.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux-core/sis_drv.c')
-rw-r--r--linux-core/sis_drv.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/linux-core/sis_drv.c b/linux-core/sis_drv.c
index 4db7b5c7..69ca3929 100644
--- a/linux-core/sis_drv.c
+++ b/linux-core/sis_drv.c
@@ -70,7 +70,7 @@ static drm_ioctl_desc_t ioctls[] = {
[DRM_IOCTL_NR(DRM_SIS_FB_INIT)] = {sis_fb_init, 1, 1}
};
-static struct drm_driver_fn driver_fn = {
+static struct drm_driver driver = {
.driver_features = DRIVER_USE_AGP | DRIVER_USE_MTRR,
.context_ctor = sis_init_context,
.context_dtor = sis_final_context,
@@ -93,10 +93,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,
@@ -105,12 +105,12 @@ static struct pci_driver driver = {
static int __init sis_init(void)
{
- return drm_init(&driver, pciidlist, &driver_fn);
+ return drm_init(&pci_driver, pciidlist, &driver);
}
static void __exit sis_exit(void)
{
- drm_exit(&driver);
+ drm_exit(&pci_driver);
}
module_init(sis_init);