diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 20:06:53 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 20:06:53 -0500 |
commit | a457aa6c2bdd743bbbffd3f9e4fdbd8c71f8af1b (patch) | |
tree | 23b1109d5d286d1e96424f0195ed8c3144e04eb1 /arch/powerpc/platforms | |
parent | dbc1651f0c5b7d13acc59d3b805a7224332fb1fb (diff) | |
parent | b3c29d85bf0dcce9e99cbfba2811aeefae017aaa (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r-- | arch/powerpc/platforms/powermac/cpufreq_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powermac/cpufreq_64.c b/arch/powerpc/platforms/powermac/cpufreq_64.c index a4b50c4109c2..a415e8d2f7af 100644 --- a/arch/powerpc/platforms/powermac/cpufreq_64.c +++ b/arch/powerpc/platforms/powermac/cpufreq_64.c | |||
@@ -80,7 +80,7 @@ static struct freq_attr* g5_cpu_freqs_attr[] = { | |||
80 | }; | 80 | }; |
81 | 81 | ||
82 | /* Power mode data is an array of the 32 bits PCR values to use for | 82 | /* Power mode data is an array of the 32 bits PCR values to use for |
83 | * the various frequencies, retreived from the device-tree | 83 | * the various frequencies, retrieved from the device-tree |
84 | */ | 84 | */ |
85 | static u32 *g5_pmode_data; | 85 | static u32 *g5_pmode_data; |
86 | static int g5_pmode_max; | 86 | static int g5_pmode_max; |