Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[sfrench/cifs-2.6.git] / include / linux / phantom.h

diff --git a/include/linux/phantom.h b/include/linux/phantom.h
index 02268c54c250767b8ec3eda32b4c68edfe768ff5..94dd6645c60ad942b4996363cecdbce30a032e84 100644 (file)
--- a/include/linux/phantom.h
+++ b/include/linux/phantom.h
@@ -10,7 +10,7 @@
 #ifndef __PHANTOM_H
 #define __PHANTOM_H
 
-#include <asm/types.h>
+#include <linux/types.h>
 
 /* PHN_(G/S)ET_REG param */
 struct phm_reg {