patch-2.4.0-test9 linux/include/asm-arm/proc-fns.h

• Lines: 58
• Date: Mon Sep 18 15:15:24 2000
• Orig file: v2.4.0-test8/linux/include/asm-arm/proc-fns.h
• Orig date: Fri May 12 11:21:20 2000

diff -u --recursive --new-file v2.4.0-test8/linux/include/asm-arm/proc-fns.h linux/include/asm-arm/proc-fns.h
@@ -1,7 +1,12 @@
 /*
- * linux/include/asm-arm/proc-fns.h
+ *  linux/include/asm-arm/proc-fns.h
  *
- * Copyright (C) 1997-1999 Russell King
+ *  Copyright (C) 1997-1999 Russell King
+ *  Copyright (C) 2000 Deep Blue Solutions Ltd
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  */
 #ifndef __ASM_PROCFNS_H
 #define __ASM_PROCFNS_H
@@ -39,28 +44,36 @@
 #   define CPU_NAME arm7
 #  endif
 # endif
-# ifdef CONFIG_CPU_SA110
+# ifdef CONFIG_CPU_ARM720
 #  ifdef CPU_NAME
 #   undef  MULTI_CPU
 #   define MULTI_CPU
 #  else
-#   define CPU_NAME sa110
+#   define CPU_NAME arm720
 #  endif
 # endif
-# ifdef CONFIG_CPU_SA1100
+# ifdef CONFIG_CPU_ARM920
 #  ifdef CPU_NAME
 #   undef  MULTI_CPU
 #   define MULTI_CPU
 #  else
-#   define CPU_NAME sa1100
+#   define CPU_NAME arm920
 #  endif
 # endif
-# ifdef CONFIG_CPU_ARM720
+# ifdef CONFIG_CPU_SA110
 #  ifdef CPU_NAME
 #   undef  MULTI_CPU
 #   define MULTI_CPU
 #  else
-#   define CPU_NAME arm720
+#   define CPU_NAME sa110
+#  endif
+# endif
+# ifdef CONFIG_CPU_SA1100
+#  ifdef CPU_NAME
+#   undef  MULTI_CPU
+#   define MULTI_CPU
+#  else
+#   define CPU_NAME sa1100
 #  endif
 # endif
 #endif