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-ttm-pool' into drm-core-next
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nv04_tv.c
diff --git
a/drivers/gpu/drm/nouveau/nv04_tv.c
b/drivers/gpu/drm/nouveau/nv04_tv.c
index
9c63099
..
c4e3404
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nv04_tv.c
+++ b/
drivers/gpu/drm/nouveau/nv04_tv.c
@@
-262,7
+262,7
@@
int nv04_tv_create(struct drm_device *dev, struct dcb_entry *entry)
nv_encoder->or = ffs(entry->or) - 1;
/* Run the slave-specific initialization */
- adap = &dev_priv->vbios
->dcb->
i2c[i2c_index].chan->adapter;
+ adap = &dev_priv->vbios
.dcb.
i2c[i2c_index].chan->adapter;
was_locked = NVLockVgaCrtcs(dev, false);