diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-12 13:08:06 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-12 13:08:06 -0500 |
commit | a7cb7bb664543e4562ab0e9a072470d2d18c761f (patch) | |
tree | 7c72fbbc681617be8c89b63c7e98a7e7b09c72de /drivers/platform/x86/intel_ips.c | |
parent | ccb5a4910d0ca7b1742b9217db2e1b95817e25ac (diff) | |
parent | 078014dd36989c66378dfe80066c3f8a1f6952e8 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree update from Jiri Kosina:
"Usual stuff: documentation updates, printk() fixes, etc"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (24 commits)
intel_ips: fix a type in error message
cpufreq: cpufreq-dt: Move newline to end of error message
ps3rom: fix error return code
treewide: fix typo in printk and Kconfig
ARM: dts: bcm63138: change "interupts" to "interrupts"
Replace mentions of "list_struct" to "list_head"
kernel: trace: fix printk message
scsi: mpt2sas: fix ioctl in comment
zbud, zswap: change module author email
clocksource: Fix 'clcoksource' typo in comment
arm: fix wording of "Crotex" in CONFIG_ARCH_EXYNOS3 help
gpio: msm-v1: make boolean argument more obvious
usb: Fix typo in usb-serial-simple.c
PCI: Fix comment typo 'COMFIG_PM_OPS'
powerpc: Fix comment typo 'CONIFG_8xx'
powerpc: Fix comment typos 'CONFiG_ALTIVEC'
clk: st: Spelling s/stucture/structure/
isci: Spelling s/stucture/structure/
usb: gadget: zero: Spelling s/infrastucture/infrastructure/
treewide: Fix company name in module descriptions
...
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 c0242ed13d9e..ecd36e332c3c 100644 --- a/drivers/platform/x86/intel_ips.c +++ b/drivers/platform/x86/intel_ips.c | |||
@@ -593,7 +593,7 @@ static void ips_disable_gpu_turbo(struct ips_driver *ips) | |||
593 | return; | 593 | return; |
594 | 594 | ||
595 | if (!ips->gpu_turbo_disable()) | 595 | if (!ips->gpu_turbo_disable()) |
596 | dev_err(&ips->dev->dev, "failed to disable graphis turbo\n"); | 596 | dev_err(&ips->dev->dev, "failed to disable graphics turbo\n"); |
597 | else | 597 | else |
598 | ips->__gpu_turbo_on = false; | 598 | ips->__gpu_turbo_on = false; |
599 | } | 599 | } |