diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-20 22:57:51 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-20 22:57:51 -0700 |
commit | ea8df8c5e609a53f4d03d133baea9561412f4303 (patch) | |
tree | 1451390f27ffad89c11671eb3e61d66f48dca00b /include/asm-mips/sibyte/sb1250_scd.h | |
parent | 241c39b9ac4bf847013aa06cce6d4d61426a2006 (diff) | |
parent | 1d464c26b5625215c4b35fb336c8f3c57d248c2e (diff) |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Fix wrong checksum for split TCP packets on 64-bit MIPS
[MIPS] Fix BUG(), BUG_ON() handling
[MIPS] Retry {save,restore}_fp_context if failed in atomic context.
[MIPS] Disallow CpU exception in kernel again.
[MIPS] Add missing silicon revisions for BCM112x
Diffstat (limited to 'include/asm-mips/sibyte/sb1250_scd.h')
-rw-r--r-- | include/asm-mips/sibyte/sb1250_scd.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-mips/sibyte/sb1250_scd.h b/include/asm-mips/sibyte/sb1250_scd.h index 7ed0bb611e5..b6a7d8f6ced 100644 --- a/include/asm-mips/sibyte/sb1250_scd.h +++ b/include/asm-mips/sibyte/sb1250_scd.h @@ -84,6 +84,7 @@ #define K_SYS_REVISION_BCM112x_A2 0x21 #define K_SYS_REVISION_BCM112x_A3 0x22 #define K_SYS_REVISION_BCM112x_A4 0x23 +#define K_SYS_REVISION_BCM112x_B0 0x30 #define K_SYS_REVISION_BCM1480_S0 0x01 #define K_SYS_REVISION_BCM1480_A1 0x02 |