summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/via/via_map.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2012-04-07 03:48:59 +0200
committerLen Brown <len.brown@intel.com>2012-04-07 03:48:59 +0200
commiteeaab2d8af2cf1d36d7086f22e9de42d6dd2995c (patch)
tree369b9c91a6d808944f07d2290fec6f9fe2731904 /drivers/gpu/drm/via/via_map.c
parentcpuidle: Fix panic in CPU off-lining with no idle driver (diff)
parentMAINTAINERS: Update git url for ACPI (diff)
downloadlinux-eeaab2d8af2cf1d36d7086f22e9de42d6dd2995c.tar.xz
linux-eeaab2d8af2cf1d36d7086f22e9de42d6dd2995c.zip
Merge branches 'idle-fix' and 'misc' into release
Diffstat (limited to 'drivers/gpu/drm/via/via_map.c')
-rw-r--r--drivers/gpu/drm/via/via_map.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/via/via_map.c b/drivers/gpu/drm/via/via_map.c
index a2ab34365151..1f182254e81e 100644
--- a/drivers/gpu/drm/via/via_map.c
+++ b/drivers/gpu/drm/via/via_map.c
@@ -106,6 +106,8 @@ int via_driver_load(struct drm_device *dev, unsigned long chipset)
idr_init(&dev->object_name_idr);
+ pci_set_master(dev->pdev);
+
ret = drm_vblank_init(dev, 1);
if (ret) {
kfree(dev_priv);