diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-26 06:28:10 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-26 06:28:10 +0200 |
| commit | bdd4f709a1501055ccb24f204fb24dd653244fd8 (patch) | |
| tree | 83d854f02dee4c2e56dbd8aad64bc9a86d52cd70 | |
| parent | mm: memcg: move pc lookup point to commit_charge() (diff) | |
| parent | dell-laptop: Terminate quirks list properly (diff) | |
| download | linux-bdd4f709a1501055ccb24f204fb24dd653244fd8.tar.xz linux-bdd4f709a1501055ccb24f204fb24dd653244fd8.zip | |
Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86
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://cavan.codon.org.uk/platform-drivers-x86:
dell-laptop: Terminate quirks list properly
intel_ips: Hush the i915 symbols message
| -rw-r--r-- | drivers/platform/x86/dell-laptop.c | 1 | ||||
| -rw-r--r-- | drivers/platform/x86/intel_ips.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c index a05fc9c955d8..e6c08ee8d46c 100644 --- a/drivers/platform/x86/dell-laptop.c +++ b/drivers/platform/x86/dell-laptop.c @@ -212,6 +212,7 @@ static struct dmi_system_id __devinitdata dell_quirks[] = { }, .driver_data = &quirk_dell_vostro_v130, }, + { } }; static struct calling_interface_buffer *buffer; diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c index f7ba316e0ed6..0ffdb3cde2bb 100644 --- a/drivers/platform/x86/intel_ips.c +++ b/drivers/platform/x86/intel_ips.c @@ -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"); |