summaryrefslogtreecommitdiffstats
path: root/include/asm-i386/mtrr.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-01-04 16:03:48 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-01-04 16:03:48 +0000
commit78c388aed2b7184182c08428db1de6c872d815f5 (patch)
tree4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /include/asm-i386/mtrr.h
parenteb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff)
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'include/asm-i386/mtrr.h')
-rw-r--r--include/asm-i386/mtrr.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-i386/mtrr.h b/include/asm-i386/mtrr.h
index 7e387cfc6..5b1e8470c 100644
--- a/include/asm-i386/mtrr.h
+++ b/include/asm-i386/mtrr.h
@@ -85,7 +85,8 @@ static __inline__ int mtrr_add (unsigned long base, unsigned long size,
{
return -ENODEV;
}
-static __inline__ mtrr_del (int reg, unsigned long base, unsigned long size)
+static __inline__ int mtrr_del (int reg, unsigned long base,
+ unsigned long size)
{
return -ENODEV;
}