Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

[karo-tx-linux.git] / arch / powerpc / kernel / l2cr_6xx.S

diff --git a/arch/powerpc/kernel/l2cr_6xx.S b/arch/powerpc/kernel/l2cr_6xx.S
index d7f4e982b53924b61d11e1df357e73487cdc0eac..97ec8557f974b2bd0c5a8e04571e1b19719a33fc 100644 (file)
--- a/arch/powerpc/kernel/l2cr_6xx.S
+++ b/arch/powerpc/kernel/l2cr_6xx.S
@@ -1,6 +1,6 @@
 /*
        L2CR functions
-       Copyright © 1997-1998 by PowerLogix R & D, Inc.
+       Copyright © 1997-1998 by PowerLogix R & D, Inc.
 
        This program is free software; you can redistribute it and/or modify
        it under the terms of the GNU General Public License as published by
@@ -40,7 +40,6 @@
        Author: Terry Greeniaus (tgree@phys.ualberta.ca)
        Please e-mail updates to this file to me, thanks!
 */
-#include <linux/config.h>
 #include <asm/processor.h>
 #include <asm/cputable.h>
 #include <asm/ppc_asm.h>
@@ -152,7 +151,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
         /**** Might be a good idea to set L2DO here - to prevent instructions
               from getting into the cache.  But since we invalidate
               the next time we enable the cache it doesn't really matter.
-              Don't do this unless you accomodate all processor variations.
+              Don't do this unless you accommodate all processor variations.
               The bit moved on the 7450.....
          ****/