diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-10-11 22:34:07 +0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-10-11 22:34:07 +0400 |
| commit | 9d93551188069a0a21e664b4bfc89ed4a6df1903 (patch) | |
| tree | bcf7334c0e57323a6844b8147ce1c92180fe8cef /drivers/gpu/drm/i915/intel_bios.c | |
| parent | dd4cae8bf16611053ee7b00e20aa4fa945b92b99 (diff) | |
| parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) | |
| download | linux-9d93551188069a0a21e664b4bfc89ed4a6df1903.tar.xz | |
Merge tag 'v3.17' into next
Synchronize with mainline to bring in changes to Synaptics and i8042
drivers.
Diffstat (limited to 'drivers/gpu/drm/i915/intel_bios.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_bios.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c index a66955037e4e..eee79e1c3222 100644 --- a/drivers/gpu/drm/i915/intel_bios.c +++ b/drivers/gpu/drm/i915/intel_bios.c @@ -1123,7 +1123,7 @@ init_vbt_defaults(struct drm_i915_private *dev_priv) } } -static int __init intel_no_opregion_vbt_callback(const struct dmi_system_id *id) +static int intel_no_opregion_vbt_callback(const struct dmi_system_id *id) { DRM_DEBUG_KMS("Falling back to manually reading VBT from " "VBIOS ROM for %s\n", |