git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-platform' into drm-testing
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
vmwgfx
/
vmwgfx_drv.c
diff --git
a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index
b793c8c
..
9dd395b
100644
(file)
--- a/
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@
-764,7
+764,7
@@
static struct drm_driver driver = {
static int vmw_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{
- return drm_get_dev(pdev, ent, &driver);
+ return drm_get_
pci_
dev(pdev, ent, &driver);
}
static int __init vmwgfx_init(void)