diff --git a/[refs] b/[refs]
index f54d8fab38a7..b52b014ed9c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 350eb8b3cb5e4860a4c8352f2cca00e6eb4a16b2
+refs/heads/master: dacd762eabf69e32f0e9181f99fd19b6f96ea5c5
diff --git a/trunk/include/asm-frv/swab.h b/trunk/include/asm-frv/swab.h
index afb3396ba5ed..f305834b4799 100644
--- a/trunk/include/asm-frv/swab.h
+++ b/trunk/include/asm-frv/swab.h
@@ -1,7 +1,7 @@
 #ifndef _ASM_SWAB_H
 #define _ASM_SWAB_H
 
-#include <asm/types.h>
+#include <linux/types.h>
 
 #if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__)
 #  define __SWAB_64_THRU_32__