diff --git a/[refs] b/[refs]
index 97ff1160723f..38d79c28257d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c52a96e6cacb35403b85c3b42db0faf26f3ed85
+refs/heads/master: 3d6364abcfdaedeb34418c2894f61251d48614f6
diff --git a/trunk/arch/sparc64/kernel/setup.c b/trunk/arch/sparc64/kernel/setup.c
index b7e6a91952b2..fbdfed3798d8 100644
--- a/trunk/arch/sparc64/kernel/setup.c
+++ b/trunk/arch/sparc64/kernel/setup.c
@@ -33,7 +33,6 @@
 #include <linux/cpu.h>
 #include <linux/initrd.h>
 
-#include <asm/segment.h>
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/processor.h>
diff --git a/trunk/include/asm-sparc64/processor.h b/trunk/include/asm-sparc64/processor.h
index d0bee2413560..3169f3e2237e 100644
--- a/trunk/include/asm-sparc64/processor.h
+++ b/trunk/include/asm-sparc64/processor.h
@@ -18,7 +18,6 @@
 #include <asm/a.out.h>
 #include <asm/pstate.h>
 #include <asm/ptrace.h>
-#include <asm/segment.h>
 #include <asm/page.h>
 
 /* The sparc has no problems with write protection */
diff --git a/trunk/include/asm-sparc64/segment.h b/trunk/include/asm-sparc64/segment.h
deleted file mode 100644
index b03e709fc945..000000000000
--- a/trunk/include/asm-sparc64/segment.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __SPARC64_SEGMENT_H
-#define __SPARC64_SEGMENT_H
-
-/* Only here because we have some old header files that expect it.. */
-
-#endif