linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-i386 / mtrr.h

diff --git a/include/asm-i386/mtrr.h b/include/asm-i386/mtrr.h
index 07f063a..5b6ceda 100644 (file)
--- a/include/asm-i386/mtrr.h
+++ b/include/asm-i386/mtrr.h
@@ -23,8 +23,8 @@
 #ifndef _LINUX_MTRR_H
 #define _LINUX_MTRR_H
 
+#include <linux/config.h>
 #include <linux/ioctl.h>
-#include <linux/errno.h>
 
 #define        MTRR_IOCTL_BASE 'M'
 
@@ -76,8 +76,6 @@ extern int mtrr_add_page (unsigned long base, unsigned long size,
 extern int mtrr_del (int reg, unsigned long base, unsigned long size);
 extern int mtrr_del_page (int reg, unsigned long base, unsigned long size);
 extern void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi);
-extern void mtrr_ap_init(void);
-extern void mtrr_bp_init(void);
 #  else
 static __inline__ int mtrr_add (unsigned long base, unsigned long size,
                                unsigned int type, char increment)
@@ -102,8 +100,6 @@ static __inline__ int mtrr_del_page (int reg, unsigned long base,
 
 static __inline__ void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi) {;}
 
-#define mtrr_ap_init() do {} while (0)
-#define mtrr_bp_init() do {} while (0)
 #  endif
 
 #endif