summaryrefslogtreecommitdiff
path: root/include/linux/ceph/msgpool.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2016-11-01 12:17:57 +0300
committerRussell King <rmk+kernel@armlinux.org.uk>2016-11-01 12:17:57 +0300
commit9902aa4728fe9128ea45f1a772e2238d64d8cdc5 (patch)
treecca30efb3ad2126fcb10aa6349ed799a5656e851 /include/linux/ceph/msgpool.h
parentdf0bd1e8f3c508bf4c3445f94b12e38289b65f13 (diff)
parent90731c24d2db7ec04df43ddbcee9605183d05187 (diff)
downloadlinux-9902aa4728fe9128ea45f1a772e2238d64d8cdc5.tar.xz
Merge branch 'drm-tda998x-mali' into drm-tda998x-devel
Diffstat (limited to 'include/linux/ceph/msgpool.h')
-rw-r--r--include/linux/ceph/msgpool.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/ceph/msgpool.h b/include/linux/ceph/msgpool.h
index 4b0d38960726..ddd0d48d0384 100644
--- a/include/linux/ceph/msgpool.h
+++ b/include/linux/ceph/msgpool.h
@@ -2,7 +2,6 @@
#define _FS_CEPH_MSGPOOL
#include <linux/mempool.h>
-#include <linux/ceph/messenger.h>
/*
* we use memory pools for preallocating messages we may receive, to