Merge tag 'v4.0-rc5' into x86/fpu, to prevent conflicts

[mirror_ubuntu-bionic-kernel.git] / lib / plist.c

diff --git a/lib/plist.c b/lib/plist.c
index d408e774b7462413a16768a928074b6aa028a965..3a30c53db06158d1b99d5aa452dd935415192cce 100644 (file)
--- a/lib/plist.c
+++ b/lib/plist.c
@@ -25,7 +25,6 @@
 
 #include <linux/bug.h>
 #include <linux/plist.h>
-#include <linux/spinlock.h>
 
 #ifdef CONFIG_DEBUG_PI_LIST