aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/fw/arc/identify.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-06-25 12:31:14 +0200
committerIngo Molnar <mingo@elte.hu>2008-06-25 12:31:14 +0200
commit607baf1f4ef94637ab0f7d0e258932851dc5c0a2 (patch)
treee5e3ed753fdad4eef8aaed2562df2a1148cec4ab /arch/mips/fw/arc/identify.c
parent064a32d82c20cdcb0119a8b316eb520608d8c647 (diff)
parent543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff)
downloadkernel_samsung_crespo-607baf1f4ef94637ab0f7d0e258932851dc5c0a2.zip
kernel_samsung_crespo-607baf1f4ef94637ab0f7d0e258932851dc5c0a2.tar.gz
kernel_samsung_crespo-607baf1f4ef94637ab0f7d0e258932851dc5c0a2.tar.bz2
Merge branch 'linus' into x86/memtest
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 28dfd2e..2306698 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,
}
};