diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-23 23:05:26 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-23 23:05:26 -0400 |
| commit | 8b1aaeaf54f1bcaa0bbec6bb170db367c998d27c (patch) | |
| tree | 2478e1708f5a3da261597f4aa1011d4d41c2cc84 /arch/x86/kernel/cpu/cpufreq/mperf.h | |
| parent | bca606a646a2b1f4fa1ae2b22a0ac707505d7297 (diff) | |
| parent | 5e152b4c9e0fce6149c74406346a7ae7e7a17727 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest
Diffstat (limited to 'arch/x86/kernel/cpu/cpufreq/mperf.h')
| -rw-r--r-- | arch/x86/kernel/cpu/cpufreq/mperf.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/x86/kernel/cpu/cpufreq/mperf.h b/arch/x86/kernel/cpu/cpufreq/mperf.h deleted file mode 100644 index 5dbf2950dc22..000000000000 --- a/arch/x86/kernel/cpu/cpufreq/mperf.h +++ /dev/null | |||
| @@ -1,9 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * (c) 2010 Advanced Micro Devices, Inc. | ||
| 3 | * Your use of this code is subject to the terms and conditions of the | ||
| 4 | * GNU general public license version 2. See "COPYING" or | ||
| 5 | * http://www.gnu.org/licenses/gpl.html | ||
| 6 | */ | ||
| 7 | |||
| 8 | unsigned int cpufreq_get_measured_perf(struct cpufreq_policy *policy, | ||
| 9 | unsigned int cpu); | ||