aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon_drv.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-07-07 04:37:35 -0400
committerDave Airlie <airlied@redhat.com>2010-07-07 04:37:35 -0400
commitdb8cc27b804f89e8fd5f9d5385161956a777c471 (patch)
tree4d84e12dbf9b4bd75fa6150f4aedf54a41d722db /drivers/gpu/drm/radeon/radeon_drv.c
parent6dbe7465713f0e45f0e867105ca944978d57346e (diff)
parent05269a3a5a78bb074413de495105d7a2686c4529 (diff)
Merge branch 'drm-platform' into drm-testing
* drm-platform: drm: Make sure the DRM offset matches the CPU drm: Add __arm defines to DRM drm: Add support for platform devices to register as DRM devices drm: Remove drm_resource wrappers
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_drv.c')
-rw-r--r--drivers/gpu/drm/radeon/radeon_drv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index e166fe4d7c30..ed0ceb3fc40a 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -238,7 +238,7 @@ static struct drm_driver kms_driver;
238static int __devinit 238static int __devinit
239radeon_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 239radeon_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
240{ 240{
241 return drm_get_dev(pdev, ent, &kms_driver); 241 return drm_get_pci_dev(pdev, ent, &kms_driver);
242} 242}
243 243
244static void 244static void