Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[mirror_ubuntu-eoan-kernel.git] / net / batman-adv / log.c

diff --git a/net/batman-adv/log.c b/net/batman-adv/log.c
index 9be74a44e99d01846602c72381cbb63c441e3fd9..853773e45f7921bccc142ed4208ff2d377134b49 100644 (file)
--- a/net/batman-adv/log.c
+++ b/net/batman-adv/log.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2010-2017  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2010-2018  B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
@@ -22,6 +22,7 @@
 #include <linux/compiler.h>
 #include <linux/debugfs.h>
 #include <linux/errno.h>
+#include <linux/eventpoll.h>
 #include <linux/export.h>
 #include <linux/fcntl.h>
 #include <linux/fs.h>
@@ -193,7 +194,7 @@ static __poll_t batadv_log_poll(struct file *file, poll_table *wait)
        poll_wait(file, &debug_log->queue_wait, wait);
 
        if (!batadv_log_empty(debug_log))
-               return POLLIN | POLLRDNORM;
+               return EPOLLIN | EPOLLRDNORM;
 
        return 0;
 }