Merge branch 'x86/boot' into x86/urgent

[karo-tx-linux.git] / include / linux / io.h

diff --git a/include/linux/io.h b/include/linux/io.h
index 986f2bffea1edc95513361a76fa55df5a3e06c06..fb5a99800e77faf6481363fb1fe43bb156d8b213 100644 (file)
--- a/include/linux/io.h
+++ b/include/linux/io.h
@@ -19,6 +19,7 @@
 #define _LINUX_IO_H
 
 #include <linux/types.h>
+#include <linux/init.h>
 #include <asm/io.h>
 #include <asm/page.h>
 
@@ -111,6 +112,13 @@ static inline void arch_phys_wc_del(int handle)
 }
 
 #define arch_phys_wc_add arch_phys_wc_add
+#ifndef arch_phys_wc_index
+static inline int arch_phys_wc_index(int handle)
+{
+       return -1;
+}
+#define arch_phys_wc_index arch_phys_wc_index
+#endif
 #endif
 
 #endif /* _LINUX_IO_H */