summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-04-02 09:27:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-04-02 09:27:29 -0700
commitcc67ccecd3e6e2827b6706bad3287786202498f5 (patch)
treeb79fa75cfb30a08450513c3cee4ac2aefc177210 /include
parent61d1757f562da687bfd5277a652bd007ad2a8419 (diff)
parent562c45d635ecd5c0648ceb4d4aff9bdc1ad91252 (diff)
Merge branch 'core-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull header file cleanup from Ingo Molnar: "Reduce <linux/interrupt.h> dependencies: a single change that drops two #includes from this frequently used kernel header" * 'core-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: headers: Drop two #included headers from <linux/interrupt.h>
Diffstat (limited to 'include')
-rw-r--r--include/linux/interrupt.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 69c238210325..5426627f9c55 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -4,9 +4,7 @@
#define _LINUX_INTERRUPT_H
#include <linux/kernel.h>
-#include <linux/linkage.h>
#include <linux/bitops.h>
-#include <linux/preempt.h>
#include <linux/cpumask.h>
#include <linux/irqreturn.h>
#include <linux/irqnr.h>