diff options
| author | Eric Anholt <eric@anholt.net> | 2009-06-22 09:14:55 +0400 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-06-22 09:33:15 +0400 |
| commit | be9f1c4f738a715abbd8ea742f3ec60a1ce73f4b (patch) | |
| tree | 0385b0a9af9a0996e3b8f01a317f3e1da8637ae8 /drivers/gpu/drm/i915/dvo.h | |
| parent | 8c52da503b7e4cf961807f11824e3258ef9f7f1c (diff) | |
| parent | fb0f8fbf97e8a25074c81c629500d94cafa9e366 (diff) | |
| download | linux-be9f1c4f738a715abbd8ea742f3ec60a1ce73f4b.tar.xz | |
Merge commit 'keithp/drm-intel-next' into drm-intel-next
Diffstat (limited to 'drivers/gpu/drm/i915/dvo.h')
| -rw-r--r-- | drivers/gpu/drm/i915/dvo.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/dvo.h b/drivers/gpu/drm/i915/dvo.h index e747ac42fe3a..288fc50627e2 100644 --- a/drivers/gpu/drm/i915/dvo.h +++ b/drivers/gpu/drm/i915/dvo.h @@ -37,7 +37,7 @@ struct intel_dvo_device { /* GPIO register used for i2c bus to control this device */ u32 gpio; int slave_addr; - struct intel_i2c_chan *i2c_bus; + struct i2c_adapter *i2c_bus; const struct intel_dvo_dev_ops *dev_ops; void *dev_priv; @@ -52,7 +52,7 @@ struct intel_dvo_dev_ops { * Returns NULL if the device does not exist. */ bool (*init)(struct intel_dvo_device *dvo, - struct intel_i2c_chan *i2cbus); + struct i2c_adapter *i2cbus); /* * Called to allow the output a chance to create properties after the |