Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel
[linux-2.6.git] / arch / arm / include / asm / proc-fns.h
index c625031..3976412 100644 (file)
 #   define CPU_NAME cpu_arm922
 #  endif
 # endif
+# ifdef CONFIG_CPU_FA526
+#  ifdef CPU_NAME
+#   undef  MULTI_CPU
+#   define MULTI_CPU
+#  else
+#   define CPU_NAME cpu_fa526
+#  endif
+# endif
 # ifdef CONFIG_CPU_ARM925T
 #  ifdef CPU_NAME
 #   undef  MULTI_CPU