diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-03-20 04:51:37 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-03-20 04:51:37 -0400 |
| commit | de49442f593c414415cac9c00b2b55b6d18b27d7 (patch) | |
| tree | 44ba0dacf2ee42e02dc0d683c51b7a4ad65c0721 /include | |
| parent | 654c59cf76a220866d1f74ab169bf469940c2d70 (diff) | |
| parent | c501ae7f332cdaf42e31af30b72b4b66cbbb1604 (diff) | |
Merge tag 'drm-intel-next-2012-03-01' of git://people.freedesktop.org/~danvet/drm-intel into drm-next
* tag 'drm-intel-next-2012-03-01' of git://people.freedesktop.org/~danvet/drm-intel:
drm/i915: Only clear the GPU domains upon a successful finish
drm/i915: reenable gmbus on gen3+ again
drm/i915: i2c: unconditionally set up gpio fallback
drm/i915: merge gmbus and gpio i2c adpater into one
drm/i915: merge struct intel_gpio into struct intel_gmbus
i2c: export bit-banging algo functions
drm/nouveau: do a better job at hiding the NIH i2c bit-banging algo
drm/i915: add dev_priv to intel_gmbus
drm/i915: Fix single msg gmbus_xfers writes
drm/i915: error_buffer->ring should be signed
drm/i915: Silence the error message from i915_wait_request()
drm/i915: use the new hdmi_force_audio enum more
drm/i915: No need to search again after retiring requests
drm/i915: Only bump refcnt on objects scheduled for eviction
drm/i915/bios: Downgrade the "signature missing" DRM_ERROR to debug
drm/i915: Ignore LVDS on hp t5745 and hp st5747 thin client
drm/i915: Fixes distorted external screen image on HP 2730p
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/i2c-algo-bit.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/i2c-algo-bit.h b/include/linux/i2c-algo-bit.h index 4f98148c11c3..584ffa0f3282 100644 --- a/include/linux/i2c-algo-bit.h +++ b/include/linux/i2c-algo-bit.h | |||
| @@ -49,5 +49,6 @@ struct i2c_algo_bit_data { | |||
| 49 | 49 | ||
| 50 | int i2c_bit_add_bus(struct i2c_adapter *); | 50 | int i2c_bit_add_bus(struct i2c_adapter *); |
| 51 | int i2c_bit_add_numbered_bus(struct i2c_adapter *); | 51 | int i2c_bit_add_numbered_bus(struct i2c_adapter *); |
| 52 | extern const struct i2c_algorithm i2c_bit_algo; | ||
| 52 | 53 | ||
| 53 | #endif /* _LINUX_I2C_ALGO_BIT_H */ | 54 | #endif /* _LINUX_I2C_ALGO_BIT_H */ |