diff options
author | Linus Torvalds | 2006-01-10 02:06:53 +0100 |
---|---|---|
committer | Linus Torvalds | 2006-01-10 02:06:53 +0100 |
commit | a457aa6c2bdd743bbbffd3f9e4fdbd8c71f8af1b (patch) | |
tree | 23b1109d5d286d1e96424f0195ed8c3144e04eb1 /arch/powerpc/mm/hash_utils_64.c | |
parent | [PATCH] rcu: don't set ->next_pending in rcu_start_batch() (diff) | |
parent | Small fixups to the EHCI Kconfig help text (diff) | |
download | kernel-qcow2-linux-a457aa6c2bdd743bbbffd3f9e4fdbd8c71f8af1b.tar.gz kernel-qcow2-linux-a457aa6c2bdd743bbbffd3f9e4fdbd8c71f8af1b.tar.xz kernel-qcow2-linux-a457aa6c2bdd743bbbffd3f9e4fdbd8c71f8af1b.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'arch/powerpc/mm/hash_utils_64.c')
-rw-r--r-- | arch/powerpc/mm/hash_utils_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c index 5bb433cbe41b..149351a84b94 100644 --- a/arch/powerpc/mm/hash_utils_64.c +++ b/arch/powerpc/mm/hash_utils_64.c @@ -368,7 +368,7 @@ static unsigned long __init htab_get_table_size(void) unsigned long mem_size, rnd_mem_size, pteg_count; /* If hash size isn't already provided by the platform, we try to - * retreive it from the device-tree. If it's not there neither, we + * retrieve it from the device-tree. If it's not there neither, we * calculate it now based on the total RAM size */ if (ppc64_pft_size == 0) |