summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_i2c.h
diff options
context:
space:
mode:
authorBen Skeggs2012-05-04 06:38:49 +0200
committerDave Airlie2012-05-07 12:02:38 +0200
commitec9b3a9de6b2a8a08c5250b466db92adf82b8d65 (patch)
treeddc6d90d5a2f160e120f52a71cf09f02bef0120a /drivers/gpu/drm/nouveau/nouveau_i2c.h
parentMerge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-in... (diff)
downloadkernel-qcow2-linux-ec9b3a9de6b2a8a08c5250b466db92adf82b8d65.tar.gz
kernel-qcow2-linux-ec9b3a9de6b2a8a08c5250b466db92adf82b8d65.tar.xz
kernel-qcow2-linux-ec9b3a9de6b2a8a08c5250b466db92adf82b8d65.zip
drm/nouveau/i2c: resume use of i2c-algo-bit, rather than custom stack
Previous issues with i2c-algo-bit have now been resolved. This is a revert of f553b79c03f0dbd52f6f03abe8233a2bef8cbd0d mostly, due to fixes in the i2c core repairing the original issue, this code isn't required and was causing regressions. Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Reported-by: Nick Bowler <nbowler@elliptictech.com> Tested-by: Nick Bowler <nbowler@elliptictech.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_i2c.h')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_i2c.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.h b/drivers/gpu/drm/nouveau/nouveau_i2c.h
index 4d2e4e9031be..1d083893a4d7 100644
--- a/drivers/gpu/drm/nouveau/nouveau_i2c.h
+++ b/drivers/gpu/drm/nouveau/nouveau_i2c.h
@@ -34,6 +34,7 @@
struct nouveau_i2c_chan {
struct i2c_adapter adapter;
struct drm_device *dev;
+ struct i2c_algo_bit_data bit;
struct list_head head;
u8 index;
u8 type;