diff options
| author | Jeff Garzik | 2005-10-29 23:49:12 +0200 |
|---|---|---|
| committer | Jeff Garzik | 2005-10-29 23:49:12 +0200 |
| commit | b0c4e148bd591629749d02a8fbc8d81c26d548cf (patch) | |
| tree | 3e2142635f3dc2ceeae870ead2dceab7b9c6def1 /arch/mips/arc/identify.c | |
| parent | Merge branch 'upstream' (diff) | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| download | kernel-qcow2-linux-b0c4e148bd591629749d02a8fbc8d81c26d548cf.tar.gz kernel-qcow2-linux-b0c4e148bd591629749d02a8fbc8d81c26d548cf.tar.xz kernel-qcow2-linux-b0c4e148bd591629749d02a8fbc8d81c26d548cf.zip | |
Merge branch 'master'
Diffstat (limited to 'arch/mips/arc/identify.c')
| -rw-r--r-- | arch/mips/arc/identify.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/mips/arc/identify.c b/arch/mips/arc/identify.c index 0dd7a345eb79..1bd6199e174a 100644 --- a/arch/mips/arc/identify.c +++ b/arch/mips/arc/identify.c @@ -44,6 +44,11 @@ static struct smatch mach_table[] = { MACH_GROUP_SGI, MACH_SGI_IP28, PROM_FLAG_ARCS + }, { "SGI-IP30", + "SGI Octane", + MACH_GROUP_SGI, + MACH_SGI_IP30, + PROM_FLAG_ARCS }, { "SGI-IP32", "SGI O2", MACH_GROUP_SGI, |