git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge drm/drm-next into drm-misc-next
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
rockchip
/
inno_hdmi.c
diff --git
a/drivers/gpu/drm/rockchip/inno_hdmi.c
b/drivers/gpu/drm/rockchip/inno_hdmi.c
index 3bb8f1382612623ff1f97aa5f8a045d87869f11f..1d2261643743d85d583e433b1230caeb4eb70714 100644
(file)
--- a/
drivers/gpu/drm/rockchip/inno_hdmi.c
+++ b/
drivers/gpu/drm/rockchip/inno_hdmi.c
@@
-887,7
+887,6
@@
static struct i2c_adapter *inno_hdmi_i2c_adapter(struct inno_hdmi *hdmi)
init_completion(&i2c->cmp);
adap = &i2c->adap;
- adap->class = I2C_CLASS_DDC;
adap->owner = THIS_MODULE;
adap->dev.parent = hdmi->dev;
adap->dev.of_node = hdmi->dev->of_node;