Merge branch 'master' into next

[cascardo/linux.git] / include / linux / connector.h

diff --git a/include/linux/connector.h b/include/linux/connector.h
index 5c7f946..34f2789 100644 (file)
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
@@ -22,7 +22,7 @@
 #ifndef __CONNECTOR_H
 #define __CONNECTOR_H
 
-#include <asm/types.h>
+#include <linux/types.h>
 
 #define CN_IDX_CONNECTOR               0xffffffff
 #define CN_VAL_CONNECTOR               0xffffffff