summaryrefslogtreecommitdiffstats
path: root/include/asm-arm/proc-fns.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-02-16 01:07:24 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-02-16 01:07:24 +0000
commit95db6b748fc86297827fbd9c9ef174d491c9ad89 (patch)
tree27a92a942821cde1edda9a1b088718d436b3efe4 /include/asm-arm/proc-fns.h
parent45b27b0a0652331d104c953a5b192d843fff88f8 (diff)
Merge with Linux 2.3.40.
Diffstat (limited to 'include/asm-arm/proc-fns.h')
-rw-r--r--include/asm-arm/proc-fns.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/asm-arm/proc-fns.h b/include/asm-arm/proc-fns.h
index 6bbe53e7c..703f653b8 100644
--- a/include/asm-arm/proc-fns.h
+++ b/include/asm-arm/proc-fns.h
@@ -47,6 +47,14 @@
# 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
#ifndef MULTI_CPU