Merge remote-tracking branches 'regulator/fix/ab3100' and 'regulator/fix/s2mps11...

[~andy/linux] / arch / sparc / kernel / trampoline_64.S

diff --git a/arch/sparc/kernel/trampoline_64.S b/arch/sparc/kernel/trampoline_64.S
index ad4bde3bb61e6763df6baf6c44b9b0f7be921f7b..737f8cbc7d56cda4e4afbdb1c7166c4fcaad3ece 100644 (file)
--- a/arch/sparc/kernel/trampoline_64.S
+++ b/arch/sparc/kernel/trampoline_64.S
@@ -4,7 +4,6 @@
  * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu)
  */
 
-#include <linux/init.h>
 
 #include <asm/head.h>
 #include <asm/asi.h>