Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

[sfrench/cifs-2.6.git] / arch / mips / include / asm / sgi / ioc.h

diff --git a/arch/mips/include/asm/sgi/ioc.h b/arch/mips/include/asm/sgi/ioc.h
index 343ed15f8dc421c16fc429064abb1973046027e7..57a971904cfe25d7573454e2ea33a0b351553f66 100644 (file)
--- a/arch/mips/include/asm/sgi/ioc.h
+++ b/arch/mips/include/asm/sgi/ioc.h
@@ -164,7 +164,7 @@ struct sgioc_regs {
        u32 _unused5;
        u8 _write[3];
        volatile u8 write;
-#define SGIOC_WRITE_NTHRESH    0x01    /* use 4.5db threshhold */
+#define SGIOC_WRITE_NTHRESH    0x01    /* use 4.5db threshold */
 #define SGIOC_WRITE_TPSPEED    0x02    /* use 100ohm TP speed */
 #define SGIOC_WRITE_EPSEL      0x04    /* force cable mode: 1=AUI 0=TP */
 #define SGIOC_WRITE_EASEL      0x08    /* 1=autoselect 0=manual cable selection */