Merge commit 'kumar/next' into next

[pandora-kernel.git] / include / linux / phantom.h

diff --git a/include/linux/phantom.h b/include/linux/phantom.h
index 02268c5..94dd664 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 {