diff options
| author | Dave Airlie | 2016-04-22 00:32:51 +0200 |
|---|---|---|
| committer | Dave Airlie | 2016-04-22 00:32:51 +0200 |
| commit | 49047962ecf02d76bdaa378c00a51c9b829ac195 (patch) | |
| tree | 4e711bead6598486b033c4d2dbdb7f7c0dd6f23a /drivers/gpu/drm/gma500 | |
| parent | Merge tag 'topic/drm-misc-2016-04-21' of git://anongit.freedesktop.org/drm-in... (diff) | |
| parent | Linux 4.6-rc3 (diff) | |
| download | kernel-qcow2-linux-49047962ecf02d76bdaa378c00a51c9b829ac195.tar.gz kernel-qcow2-linux-49047962ecf02d76bdaa378c00a51c9b829ac195.tar.xz kernel-qcow2-linux-49047962ecf02d76bdaa378c00a51c9b829ac195.zip | |
Merge tag 'v4.6-rc3' into drm-next
Backmerge 4.6-rc3 for i915.
Linux 4.6-rc3
Diffstat (limited to 'drivers/gpu/drm/gma500')
| -rw-r--r-- | drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/gma500/cdv_intel_dp.c b/drivers/gpu/drm/gma500/cdv_intel_dp.c index 7bb1f1aff932..c52f9adf5e04 100644 --- a/drivers/gpu/drm/gma500/cdv_intel_dp.c +++ b/drivers/gpu/drm/gma500/cdv_intel_dp.c @@ -220,7 +220,7 @@ i2c_dp_aux_prepare_bus(struct i2c_adapter *adapter) * FIXME: This is the old dp aux helper, gma500 is the last driver that needs to * be ported over to the new helper code in drm_dp_helper.c like i915 or radeon. */ -static int __deprecated +static int i2c_dp_aux_add_bus(struct i2c_adapter *adapter) { int error; |