Commit bdd4f709 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of git://

Pull x86 platform driver fixes from Matthew Garrett:
 "One annoyance fix (make intel_ips stop complaining unnecessarily) and
  one oops fix (unterminated list in dell-laptop).  Both have been in
  -next for a while with no complaints."

* 'for_linus' of git://
  dell-laptop: Terminate quirks list properly
  intel_ips: Hush the i915 symbols message
parents ce587e65 d62d421b
......@@ -212,6 +212,7 @@ static struct dmi_system_id __devinitdata dell_quirks[] = {
.driver_data = &quirk_dell_vostro_v130,
{ }
static struct calling_interface_buffer *buffer;
......@@ -1565,7 +1565,7 @@ static int ips_probe(struct pci_dev *dev, const struct pci_device_id *id)
ips->poll_turbo_status = true;
if (!ips_get_i915_syms(ips)) {
dev_err(&dev->dev, "failed to get i915 symbols, graphics turbo disabled\n");
dev_info(&dev->dev, "failed to get i915 symbols, graphics turbo disabled until i915 loads\n");
ips->gpu_turbo_enabled = false;
} else {
dev_dbg(&dev->dev, "graphics turbo enabled\n");
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment