Merge tag 'v3.15' into next

[firefly-linux-kernel-4.4.55.git] / arch / sparc / kernel / trampoline_32.S

diff --git a/arch/sparc/kernel/trampoline_32.S b/arch/sparc/kernel/trampoline_32.S
index 76dcbd3c988aed9445de17442e8cb1076ef5cc49..3eed99fc69892f40c34e2865895928c35b78067f 100644 (file)
--- a/arch/sparc/kernel/trampoline_32.S
+++ b/arch/sparc/kernel/trampoline_32.S
@@ -5,7 +5,6 @@
  * Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
  */
 
-#include <linux/init.h>
 #include <asm/head.h>
 #include <asm/psr.h>
 #include <asm/page.h>