diff --git a/[refs] b/[refs]
index ad774d3c8b49..1d4643905c67 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffa009c366e33f3eae48bba2547051fe15795f64
+refs/heads/master: c47ae9adfdd3a9551969534dbb0d5606ec646526
diff --git a/trunk/arch/frv/mm/tlb-miss.S b/trunk/arch/frv/mm/tlb-miss.S
index 07643482cad2..7f392bc651a3 100644
--- a/trunk/arch/frv/mm/tlb-miss.S
+++ b/trunk/arch/frv/mm/tlb-miss.S
@@ -13,7 +13,6 @@
 #include <linux/linkage.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
-#include <asm/highmem.h>
 #include <asm/spr-regs.h>
 
 	.section	.text.tlbmiss