Merge tag 'for-linus-4.13-v2' of git://github.com/cminyard/linux-ipmi

[thirdparty/kernel/linux.git] / drivers / char / ipmi / ipmi_watchdog.c

diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
index 4161d9961a2416b30ac92223e0068c47b9822b75..3d832d0362a4fc6150f8f03886ffce552104a3af 100644 (file)
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -821,7 +821,7 @@ static ssize_t ipmi_read(struct file *file,
                         loff_t      *ppos)
 {
        int          rv = 0;
-       wait_queue_t wait;
+       wait_queue_entry_t wait;
 
        if (count <= 0)
                return 0;