diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-26 20:00:35 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-26 20:00:35 -0700 |
| commit | 8fe5f56c8a203a7a83d1b621c369655d914f3752 (patch) | |
| tree | ec865efb2d577d1e536720a28ae18b10bdbfd973 /drivers/platform/x86/intel_ips.c | |
| parent | df2e7f525d88da992021b589d8a412afc15de36c (diff) | |
| parent | 82b769063598d01a8b24abf250a53f8b437e09f1 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Conflicts:
arch/sparc/kernel/leon_smp.c
Merge mainline to get the nobootmem.c bug fix, for the sake
of the sparc64 NO_BOOTMEM conversion.
Resolve a small include line conflict in leon_smp.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/platform/x86/intel_ips.c')
| -rw-r--r-- | drivers/platform/x86/intel_ips.c | 2 |
1 files changed, 1 insertions, 1 deletions
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"); |