summaryrefslogtreecommitdiffstats
path: root/arch/mips/include/asm/module.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-05-23 04:35:33 +0200
committerPaul Mundt <lethal@linux-sh.org>2011-05-23 04:35:33 +0200
commit8ace5c4698ec8da53e69095596718d5a936433de (patch)
tree1f5959b3ac289e3bde420cc14109be0cc518a75a /arch/mips/include/asm/module.h
parentsh: fixup fpu.o compile order (diff)
parentMerge branch 'viafb-next' of git://github.com/schandinat/linux-2.6 (diff)
downloadlinux-8ace5c4698ec8da53e69095596718d5a936433de.tar.xz
linux-8ace5c4698ec8da53e69095596718d5a936433de.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'arch/mips/include/asm/module.h')
-rw-r--r--arch/mips/include/asm/module.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/include/asm/module.h b/arch/mips/include/asm/module.h
index d94085a3eafb..bc01a02cacd8 100644
--- a/arch/mips/include/asm/module.h
+++ b/arch/mips/include/asm/module.h
@@ -118,6 +118,8 @@ search_module_dbetables(unsigned long addr)
#define MODULE_PROC_FAMILY "LOONGSON2 "
#elif defined CONFIG_CPU_CAVIUM_OCTEON
#define MODULE_PROC_FAMILY "OCTEON "
+#elif defined CONFIG_CPU_XLR
+#define MODULE_PROC_FAMILY "XLR "
#else
#error MODULE_PROC_FAMILY undefined for your processor configuration
#endif