diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-08 06:24:38 +0100 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-08 06:24:38 +0100 |
commit | 24f030175d30f019be41766cdf88c2ff03de19ff (patch) | |
tree | 354232a84e82d5a721ed7b1a9af580ff2a59be8f /Documentation/powerpc | |
parent | Merge commit 'kumar/kumar-next' into next (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
download | linux-24f030175d30f019be41766cdf88c2ff03de19ff.tar.xz linux-24f030175d30f019be41766cdf88c2ff03de19ff.zip |
Merge commit 'origin/master' into next
Diffstat (limited to 'Documentation/powerpc')
-rw-r--r-- | Documentation/powerpc/cpu_features.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/powerpc/cpu_features.txt b/Documentation/powerpc/cpu_features.txt index 472739880e87..ffa4183fdb8b 100644 --- a/Documentation/powerpc/cpu_features.txt +++ b/Documentation/powerpc/cpu_features.txt @@ -31,7 +31,7 @@ anyways). After detecting the processor type, the kernel patches out sections of code that shouldn't be used by writing nop's over it. Using cpufeatures requires -just 2 macros (found in include/asm-ppc/cputable.h), as seen in head.S +just 2 macros (found in arch/powerpc/include/asm/cputable.h), as seen in head.S transfer_to_handler: #ifdef CONFIG_ALTIVEC |