diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 10:23:59 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 10:23:59 (GMT) |
| commit | ace7f1b79670aa0c1d9f4b0442be82e565827333 (patch) | |
| tree | ed4625a9cbc8e28db2b1ff9fad111c4c012508a3 /drivers/char/drm | |
| parent | a60b33cf59d1c9e0e363287fce799cb23d45660c (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
| download | linux-fsl-qoriq-ace7f1b79670aa0c1d9f4b0442be82e565827333.tar.xz | |
Merge branch 'linus' into core/softirq
Diffstat (limited to 'drivers/char/drm')
| -rw-r--r-- | drivers/char/drm/i915_drv.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/drm/i915_drv.c b/drivers/char/drm/i915_drv.c index e8f3d68..93aed1c 100644 --- a/drivers/char/drm/i915_drv.c +++ b/drivers/char/drm/i915_drv.c @@ -389,6 +389,7 @@ static int i915_resume(struct drm_device *dev) pci_restore_state(dev->pdev); if (pci_enable_device(dev->pdev)) return -1; + pci_set_master(dev->pdev); pci_write_config_byte(dev->pdev, LBB, dev_priv->saveLBB); |