Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-microblaze.git] / drivers / misc / hpilo.c

diff --git a/drivers/misc/hpilo.c b/drivers/misc/hpilo.c
index 35693c0..e9c9ef5 100644 (file)
--- a/drivers/misc/hpilo.c
+++ b/drivers/misc/hpilo.c
@@ -519,9 +519,9 @@ static __poll_t ilo_poll(struct file *fp, poll_table *wait)
        poll_wait(fp, &data->ccb_waitq, wait);
 
        if (is_channel_reset(driver_ccb))
-               return POLLERR;
+               return EPOLLERR;
        else if (ilo_pkt_recv(data->ilo_hw, driver_ccb))
-               return POLLIN | POLLRDNORM;
+               return EPOLLIN | EPOLLRDNORM;
 
        return 0;
 }