git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
include
/
asm-x86_64
/
mtrr.h
diff --git
a/include/asm-x86_64/mtrr.h
b/include/asm-x86_64/mtrr.h
index
66ac1c0
..
d6135b2
100644
(file)
--- a/
include/asm-x86_64/mtrr.h
+++ b/
include/asm-x86_64/mtrr.h
@@
-23,9
+23,7
@@
#ifndef _LINUX_MTRR_H
#define _LINUX_MTRR_H
#ifndef _LINUX_MTRR_H
#define _LINUX_MTRR_H
-#include <linux/config.h>
#include <linux/ioctl.h>
#include <linux/ioctl.h>
-#include <linux/compat.h>
#define MTRR_IOCTL_BASE 'M'
#define MTRR_IOCTL_BASE 'M'
@@
-102,11
+100,10
@@
static __inline__ int mtrr_del_page (int reg, unsigned long base,
return -ENODEV;
}
return -ENODEV;
}
-# endif
-
-#endif
+#endif /* CONFIG_MTRR */
#ifdef CONFIG_COMPAT
#ifdef CONFIG_COMPAT
+#include <linux/compat.h>
struct mtrr_sentry32
{
struct mtrr_sentry32
{
@@
-138,4
+135,6
@@
struct mtrr_gentry32
#endif /* CONFIG_COMPAT */
#endif /* CONFIG_COMPAT */
+#endif /* __KERNEL__ */
+
#endif /* _LINUX_MTRR_H */
#endif /* _LINUX_MTRR_H */