aboutsummaryrefslogtreecommitdiff
path: root/include/asm-mips/bootinfo.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 17:21:38 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 17:21:38 -0800
commit200d018eff4be3a1fb9823441cfcebb7de86a677 (patch)
tree76dc7b8643da0fc19208067c44e3f346f11f6cc8 /include/asm-mips/bootinfo.h
parenteb991b39385c7b04923d701764a34694ec54b53d (diff)
parentf0647a52974daccbe20990fb6341f07792445fe0 (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: [PATCH] add STB810 support (Philips PNX8550-based) [MIPS] Qemu now has an ELF loader. [MIPS] Add GENERIC_HARDIRQS_NO__DO_IRQ for i8259 users [MIPS] Optimize csum_partial for 64bit kernel [MIPS] Optimize flow of csum_partial [MIPS] Make csum_partial more readable [MIPS] Rename SNI_RM200_PCI to just SNI_RM preparing for more RM machines
Diffstat (limited to 'include/asm-mips/bootinfo.h')
-rw-r--r--include/asm-mips/bootinfo.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-mips/bootinfo.h b/include/asm-mips/bootinfo.h
index 1e5ccdad3b0..8e321f53a38 100644
--- a/include/asm-mips/bootinfo.h
+++ b/include/asm-mips/bootinfo.h
@@ -131,6 +131,7 @@
#define MACH_PHILIPS_NINO 0 /* Nino */
#define MACH_PHILIPS_VELO 1 /* Velo */
#define MACH_PHILIPS_JBS 2 /* JBS */
+#define MACH_PHILIPS_STB810 3 /* STB810 */
/*
* Valid machtype for group SIBYTE