aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/cpufreq
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-24 16:34:56 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-24 16:34:56 -0400
commitd14b7a419a664cd7c1c585c9e7fffee9e9051d53 (patch)
tree42a1d5b61b58fa0a75252b082c4c6cef6fa9fd8d /drivers/cpufreq
parente8ff13b0bf88b5e696323a1eec877783d965b3c6 (diff)
parenta58b3a4aba2fd5c445d9deccc73192bff48b591d (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina: "Trivial updates all over the place as usual." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (29 commits) Fix typo in include/linux/clk.h . pci: hotplug: Fix typo in pci iommu: Fix typo in iommu video: Fix typo in drivers/video Documentation: Add newline at end-of-file to files lacking one arm,unicore32: Remove obsolete "select MISC_DEVICES" module.c: spelling s/postition/position/g cpufreq: Fix typo in cpufreq driver trivial: typo in comment in mksysmap mach-omap2: Fix typo in debug message and comment scsi: aha152x: Fix sparse warning and make printing pointer address more portable. Change email address for Steve Glendinning Btrfs: fix typo in convert_extent_bit via: Remove bogus if check netprio_cgroup.c: fix comment typo backlight: fix memory leak on obscure error path Documentation: asus-laptop.txt references an obsolete Kconfig item Documentation: ManagementStyle: fixed typo mm/vmscan: cleanup comment error in balance_pgdat mm: cleanup on the comments of zone_reclaim_stat ...
Diffstat (limited to 'drivers/cpufreq')
-rw-r--r--drivers/cpufreq/s3c2416-cpufreq.c4
-rw-r--r--drivers/cpufreq/speedstep-ich.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/cpufreq/s3c2416-cpufreq.c b/drivers/cpufreq/s3c2416-cpufreq.c
index 50d2f15a3c8..bcc053bc02c 100644
--- a/drivers/cpufreq/s3c2416-cpufreq.c
+++ b/drivers/cpufreq/s3c2416-cpufreq.c
@@ -153,7 +153,7 @@ static int s3c2416_cpufreq_enter_dvs(struct s3c2416_data *s3c_freq, int idx)
153 if (s3c_freq->vddarm) { 153 if (s3c_freq->vddarm) {
154 dvfs = &s3c2416_dvfs_table[idx]; 154 dvfs = &s3c2416_dvfs_table[idx];
155 155
156 pr_debug("cpufreq: setting regultor to %d-%d\n", 156 pr_debug("cpufreq: setting regulator to %d-%d\n",
157 dvfs->vddarm_min, dvfs->vddarm_max); 157 dvfs->vddarm_min, dvfs->vddarm_max);
158 ret = regulator_set_voltage(s3c_freq->vddarm, 158 ret = regulator_set_voltage(s3c_freq->vddarm,
159 dvfs->vddarm_min, 159 dvfs->vddarm_min,
@@ -186,7 +186,7 @@ static int s3c2416_cpufreq_leave_dvs(struct s3c2416_data *s3c_freq, int idx)
186 if (s3c_freq->vddarm) { 186 if (s3c_freq->vddarm) {
187 dvfs = &s3c2416_dvfs_table[idx]; 187 dvfs = &s3c2416_dvfs_table[idx];
188 188
189 pr_debug("cpufreq: setting regultor to %d-%d\n", 189 pr_debug("cpufreq: setting regulator to %d-%d\n",
190 dvfs->vddarm_min, dvfs->vddarm_max); 190 dvfs->vddarm_min, dvfs->vddarm_max);
191 ret = regulator_set_voltage(s3c_freq->vddarm, 191 ret = regulator_set_voltage(s3c_freq->vddarm,
192 dvfs->vddarm_min, 192 dvfs->vddarm_min,
diff --git a/drivers/cpufreq/speedstep-ich.c b/drivers/cpufreq/speedstep-ich.c
index 7432b3a72cd..e29b59aa68a 100644
--- a/drivers/cpufreq/speedstep-ich.c
+++ b/drivers/cpufreq/speedstep-ich.c
@@ -203,7 +203,7 @@ static unsigned int speedstep_detect_chipset(void)
203 if (speedstep_chipset_dev) { 203 if (speedstep_chipset_dev) {
204 /* speedstep.c causes lockups on Dell Inspirons 8000 and 204 /* speedstep.c causes lockups on Dell Inspirons 8000 and
205 * 8100 which use a pretty old revision of the 82815 205 * 8100 which use a pretty old revision of the 82815
206 * host brige. Abort on these systems. 206 * host bridge. Abort on these systems.
207 */ 207 */
208 static struct pci_dev *hostbridge; 208 static struct pci_dev *hostbridge;
209 209