summaryrefslogtreecommitdiffstats
path: root/arch/mips/fw/arc/identify.c
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2008-07-03 22:24:06 +0200
committerJ. Bruce Fields <bfields@citi.umich.edu>2008-07-03 22:24:06 +0200
commite86322f611eef95aafaf726fd3965e5b211f1985 (patch)
tree28547e26df4fc6ae671dc8cc6912a53717e4db08 /arch/mips/fw/arc/identify.c
parentnfsd: dprint operation names (diff)
parentsvcrdma: Change WR context get/put to use the kmem cache (diff)
downloadlinux-e86322f611eef95aafaf726fd3965e5b211f1985.tar.xz
linux-e86322f611eef95aafaf726fd3965e5b211f1985.zip
Merge branch 'for-bfields' of git://linux-nfs.org/~tomtucker/xprt-switch-2.6 into for-2.6.27
Diffstat (limited to 'arch/mips/fw/arc/identify.c')
-rw-r--r--arch/mips/fw/arc/identify.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/mips/fw/arc/identify.c b/arch/mips/fw/arc/identify.c
index 28dfd2e2989a..23066985a734 100644
--- a/arch/mips/fw/arc/identify.c
+++ b/arch/mips/fw/arc/identify.c
@@ -67,6 +67,11 @@ static struct smatch mach_table[] = {
.liname = "SNI RM200_PCI",
.type = MACH_SNI_RM200_PCI,
.flags = PROM_FLAG_DONT_FREE_TEMP,
+ }, {
+ .arcname = "RM200PCI-R5K",
+ .liname = "SNI RM200_PCI-R5K",
+ .type = MACH_SNI_RM200_PCI,
+ .flags = PROM_FLAG_DONT_FREE_TEMP,
}
};