diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 20:46:21 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 20:46:21 -0400 |
commit | 70ac4385a13f78bc478f26d317511893741b05bd (patch) | |
tree | dafc7f3018295fc4ee00339889e4f35d5b9d7743 /include/asm-x86_64/mtrr.h | |
parent | d59bf96cdde5b874a57bfd1425faa45da915d0b7 (diff) | |
parent | 077e98945db7e54a9865b5f29a1f02f531eca414 (diff) |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
include/linux/nfs_fs.h
Fixed up conflict with kernel header updates.
Diffstat (limited to 'include/asm-x86_64/mtrr.h')
-rw-r--r-- | include/asm-x86_64/mtrr.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/asm-x86_64/mtrr.h b/include/asm-x86_64/mtrr.h index 66ac1c0f27e1..d6135b2549bf 100644 --- a/include/asm-x86_64/mtrr.h +++ b/include/asm-x86_64/mtrr.h | |||
@@ -23,9 +23,7 @@ | |||
23 | #ifndef _LINUX_MTRR_H | 23 | #ifndef _LINUX_MTRR_H |
24 | #define _LINUX_MTRR_H | 24 | #define _LINUX_MTRR_H |
25 | 25 | ||
26 | #include <linux/config.h> | ||
27 | #include <linux/ioctl.h> | 26 | #include <linux/ioctl.h> |
28 | #include <linux/compat.h> | ||
29 | 27 | ||
30 | #define MTRR_IOCTL_BASE 'M' | 28 | #define MTRR_IOCTL_BASE 'M' |
31 | 29 | ||
@@ -102,11 +100,10 @@ static __inline__ int mtrr_del_page (int reg, unsigned long base, | |||
102 | return -ENODEV; | 100 | return -ENODEV; |
103 | } | 101 | } |
104 | 102 | ||
105 | # endif | 103 | #endif /* CONFIG_MTRR */ |
106 | |||
107 | #endif | ||
108 | 104 | ||
109 | #ifdef CONFIG_COMPAT | 105 | #ifdef CONFIG_COMPAT |
106 | #include <linux/compat.h> | ||
110 | 107 | ||
111 | struct mtrr_sentry32 | 108 | struct mtrr_sentry32 |
112 | { | 109 | { |
@@ -138,4 +135,6 @@ struct mtrr_gentry32 | |||
138 | 135 | ||
139 | #endif /* CONFIG_COMPAT */ | 136 | #endif /* CONFIG_COMPAT */ |
140 | 137 | ||
138 | #endif /* __KERNEL__ */ | ||
139 | |||
141 | #endif /* _LINUX_MTRR_H */ | 140 | #endif /* _LINUX_MTRR_H */ |