diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-23 05:11:42 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-23 05:11:42 -0400 |
commit | f34bfb1beef8a17ba3d46b60f8fa19ffedc1ed8d (patch) | |
tree | 0816c565d26ae24854616faa0d497be365c2fe8b /arch/mips/fw/arc/identify.c | |
parent | ee4311adf105f4d740f52e3948acc1d81598afcc (diff) | |
parent | 481c5346d0981940ee63037eb53e4e37b0735c10 (diff) |
Merge branch 'linus' into tracing/ftrace
Diffstat (limited to 'arch/mips/fw/arc/identify.c')
-rw-r--r-- | arch/mips/fw/arc/identify.c | 5 |
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[] = { | |||
67 | .liname = "SNI RM200_PCI", | 67 | .liname = "SNI RM200_PCI", |
68 | .type = MACH_SNI_RM200_PCI, | 68 | .type = MACH_SNI_RM200_PCI, |
69 | .flags = PROM_FLAG_DONT_FREE_TEMP, | 69 | .flags = PROM_FLAG_DONT_FREE_TEMP, |
70 | }, { | ||
71 | .arcname = "RM200PCI-R5K", | ||
72 | .liname = "SNI RM200_PCI-R5K", | ||
73 | .type = MACH_SNI_RM200_PCI, | ||
74 | .flags = PROM_FLAG_DONT_FREE_TEMP, | ||
70 | } | 75 | } |
71 | }; | 76 | }; |
72 | 77 | ||