diff options
| author | Johan Hovold <johan@kernel.org> | 2014-09-15 12:07:37 -0400 |
|---|---|---|
| committer | Johan Hovold <johan@kernel.org> | 2014-09-15 12:10:34 -0400 |
| commit | 4b7154ba70bb20a3c024faabdd2bc207b550a813 (patch) | |
| tree | 99a6e1204ec5deaca27bcbfc75ca16d3633433f2 /drivers/gpu/drm/i915/intel_bios.c | |
| parent | adceac14166da8c466223a35ec59c4a4adeef976 (diff) | |
| parent | 9e82bf014195d6f0054982c463575cdce24292be (diff) | |
Merge tag 'v3.17-rc5' into usb-next
USB fixes in Linux 3.17-rc5 are needed to build on top of for 3.18.
Signed-off-by: Johan Hovold <johan@kernel.org>
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) | |||
| 1123 | } | 1123 | } |
| 1124 | } | 1124 | } |
| 1125 | 1125 | ||
| 1126 | static int __init intel_no_opregion_vbt_callback(const struct dmi_system_id *id) | 1126 | static int intel_no_opregion_vbt_callback(const struct dmi_system_id *id) |
| 1127 | { | 1127 | { |
| 1128 | DRM_DEBUG_KMS("Falling back to manually reading VBT from " | 1128 | DRM_DEBUG_KMS("Falling back to manually reading VBT from " |
| 1129 | "VBIOS ROM for %s\n", | 1129 | "VBIOS ROM for %s\n", |