diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-07-12 15:28:17 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-07-12 15:28:17 -0700 |
| commit | 5522136b7f01402ae02cbe35180e3d80f850a6b3 (patch) | |
| tree | 275da77af4df8b332f17cb503a4b58b608de8620 /linux-core/drm_drv.c | |
| parent | 76ca1e858fb8e1a65ea49c0c62350d7ca91044a2 (diff) | |
| parent | 851c950d988e5a47fa6add71427e5ef8d4dcf231 (diff) | |
Merge branch 'master' into xgi-0-0-2
Diffstat (limited to 'linux-core/drm_drv.c')
| -rw-r--r-- | linux-core/drm_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c index d5eb9713..0d446a12 100644 --- a/linux-core/drm_drv.c +++ b/linux-core/drm_drv.c @@ -113,7 +113,7 @@ static drm_ioctl_desc_t drm_ioctls[] = { [DRM_IOCTL_NR(DRM_IOCTL_AGP_UNBIND)] = {drm_agp_unbind_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY}, #endif - [DRM_IOCTL_NR(DRM_IOCTL_SG_ALLOC)] = {drm_sg_alloc, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY}, + [DRM_IOCTL_NR(DRM_IOCTL_SG_ALLOC)] = {drm_sg_alloc_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY}, [DRM_IOCTL_NR(DRM_IOCTL_SG_FREE)] = {drm_sg_free, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY}, [DRM_IOCTL_NR(DRM_IOCTL_WAIT_VBLANK)] = {drm_wait_vblank, 0}, @@ -311,7 +311,7 @@ int drm_init(struct drm_driver *driver, } if (!drm_fb_loaded) - pci_register_driver(&driver->pci_driver); + return pci_register_driver(&driver->pci_driver); else { for (i = 0; pciidlist[i].vendor != 0; i++) { pid = &pciidlist[i]; |