diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
| commit | ff877ea80efa2015b6263766f78ee42c2a1b32f9 (patch) | |
| tree | 85205005c611ab774702148558321c6fb92f1ccd /include/asm-mips/cpu.h | |
| parent | 30821fee4f0cb3e6d241d9f7ddc37742212e3eb7 (diff) | |
| parent | d37e6bf68fc1eb34a4ad21d9ae8890ed37ea80e7 (diff) | |
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
Diffstat (limited to 'include/asm-mips/cpu.h')
| -rw-r--r-- | include/asm-mips/cpu.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-mips/cpu.h b/include/asm-mips/cpu.h index 1c35cac6f35b..229a786101d9 100644 --- a/include/asm-mips/cpu.h +++ b/include/asm-mips/cpu.h | |||
| @@ -66,8 +66,10 @@ | |||
| 66 | #define PRID_IMP_RM7000 0x2700 | 66 | #define PRID_IMP_RM7000 0x2700 |
| 67 | #define PRID_IMP_NEVADA 0x2800 /* RM5260 ??? */ | 67 | #define PRID_IMP_NEVADA 0x2800 /* RM5260 ??? */ |
| 68 | #define PRID_IMP_RM9000 0x3400 | 68 | #define PRID_IMP_RM9000 0x3400 |
| 69 | #define PRID_IMP_LOONGSON1 0x4200 | ||
| 69 | #define PRID_IMP_R5432 0x5400 | 70 | #define PRID_IMP_R5432 0x5400 |
| 70 | #define PRID_IMP_R5500 0x5500 | 71 | #define PRID_IMP_R5500 0x5500 |
| 72 | #define PRID_IMP_LOONGSON2 0x6300 | ||
| 71 | 73 | ||
| 72 | #define PRID_IMP_UNKNOWN 0xff00 | 74 | #define PRID_IMP_UNKNOWN 0xff00 |
| 73 | 75 | ||
| @@ -90,8 +92,6 @@ | |||
| 90 | #define PRID_IMP_24KE 0x9600 | 92 | #define PRID_IMP_24KE 0x9600 |
| 91 | #define PRID_IMP_74K 0x9700 | 93 | #define PRID_IMP_74K 0x9700 |
| 92 | #define PRID_IMP_1004K 0x9900 | 94 | #define PRID_IMP_1004K 0x9900 |
| 93 | #define PRID_IMP_LOONGSON1 0x4200 | ||
| 94 | #define PRID_IMP_LOONGSON2 0x6300 | ||
| 95 | 95 | ||
| 96 | /* | 96 | /* |
| 97 | * These are the PRID's for when 23:16 == PRID_COMP_SIBYTE | 97 | * These are the PRID's for when 23:16 == PRID_COMP_SIBYTE |