Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 345334
b: refs/heads/master
c: 83ef777
h: refs/heads/master
v: v3
  • Loading branch information
Tommi Rantala authored and Dave Airlie committed Nov 20, 2012
1 parent c15940d commit 65fb933
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 302381511f4b1bc98c6f61ccaec5d8e98ccd0365
refs/heads/master: 83ef7777aa5ffbf08a71e14f0a127de315293113
1 change: 1 addition & 0 deletions trunk/drivers/gpu/drm/nouveau/nouveau_drm.c
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ nouveau_drm_probe(struct pci_dev *pdev, const struct pci_device_id *pent)
boot = pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW;
#endif
remove_conflicting_framebuffers(aper, "nouveaufb", boot);
kfree(aper);

ret = nouveau_device_create(pdev, nouveau_name(pdev), pci_name(pdev),
nouveau_config, nouveau_debug, &device);
Expand Down

0 comments on commit 65fb933

Please sign in to comment.