summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-03-05 08:23:32 +0100
committerTakashi Iwai <tiwai@suse.de>2010-03-05 08:23:32 +0100
commit36e632d61ae2febf55d5cd93b9e5ae0f5a5c6207 (patch)
tree1dd1a6cd08f50c284588400c9e426aa8eba07c5e /sound
parent767d75ad1c08c31646498a13837a5c59db90ccad (diff)
parent2b9ddcb8b2ce6a44f0f969000f16b016caa64294 (diff)
Merge branch 'topic/misc' into topic/usb
Diffstat (limited to 'sound')
-rw-r--r--sound/isa/sb/jazz16.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/isa/sb/jazz16.c b/sound/isa/sb/jazz16.c
index 8d21a3feda3..8ccbcddf08e 100644
--- a/sound/isa/sb/jazz16.c
+++ b/sound/isa/sb/jazz16.c
@@ -14,6 +14,7 @@
#include <linux/init.h>
#include <linux/module.h>
#include <linux/io.h>
+#include <linux/delay.h>
#include <asm/dma.h>
#include <linux/isa.h>
#include <sound/core.h>