diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:24:32 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:24:32 +0200 |
| commit | 5d641e7bbb8ed48f231bc902eecab2cc598f34a4 (patch) | |
| tree | 1be4ef1941355af508cc203838560a50707851bc /arch/mips/fw/arc/identify.c | |
| parent | 9ae76f5d8ab546660cf517bb63c64de51800955d (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into safe-poison-pointerstip-safe-poison-pointers-2008-06-25_10.24_Wed
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[] = { .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, } }; |