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 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nouveau_i2c.c
diff --git
a/drivers/gpu/drm/nouveau/nouveau_i2c.c
b/drivers/gpu/drm/nouveau/nouveau_i2c.c
index
fdd7e3d
..
cb389d0
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_i2c.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_i2c.c
@@
-256,7
+256,7
@@
nouveau_i2c_find(struct drm_device *dev, int index)
if (index >= DCB_MAX_NUM_I2C_ENTRIES)
return NULL;
- if (dev_priv->c
hipset
>= NV_50 && (i2c->entry & 0x00000100)) {
+ if (dev_priv->c
ard_type
>= NV_50 && (i2c->entry & 0x00000100)) {
uint32_t reg = 0xe500, val;
if (i2c->port_type == 6) {