summaryrefslogtreecommitdiff
path: root/include/linux/cacheinfo.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-12-20 12:00:30 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-12-20 12:00:30 +0300
commit35eaa42c4a1017c08d0572008db375becb621744 (patch)
tree8185b6d18acfc63285e3132c9039c7d6c9a90527 /include/linux/cacheinfo.h
parent4b95391c8ef0f270ed58234597aef58976abe01c (diff)
parenta7904a538933c525096ca2ccde1e60d0ee62c08e (diff)
downloadlinux-35eaa42c4a1017c08d0572008db375becb621744.tar.xz
Merge 5.16-rc6 into tty-next
We need the tty/serial fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/cacheinfo.h')
-rw-r--r--include/linux/cacheinfo.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/cacheinfo.h b/include/linux/cacheinfo.h
index 2f909ed084c6..4ff37cb763ae 100644
--- a/include/linux/cacheinfo.h
+++ b/include/linux/cacheinfo.h
@@ -3,7 +3,6 @@
#define _LINUX_CACHEINFO_H
#include <linux/bitops.h>
-#include <linux/cpu.h>
#include <linux/cpumask.h>
#include <linux/smp.h>