Merge branch 'for-linus' into for-next

Back-merge 4.13-rc devel branch for later development.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 1 insertions, 1 deletions

diff --git a/sound/isa/wavefront/wavefront_synth.c b/sound/isa/wavefront/wavefront_synth.c
index 4dae9ff9ef5a..0b1e4b34b299 100644
--- a/sound/isa/wavefront/wavefront_synth.c
+++ b/sound/isa/wavefront/wavefront_synth.c
@@ -1782,7 +1782,7 @@ wavefront_should_cause_interrupt (snd_wavefront_t *dev,
                                   int val, int port, unsigned long timeout)
 
 {
-        wait_queue_t wait;
+        wait_queue_entry_t wait;
 
         init_waitqueue_entry(&wait, current);
         spin_lock_irq(&dev->irq_lock);