Merge commit 'v2.6.37-rc1' into for-2.6.37

[karo-tx-linux.git] / sound / isa / sb / jazz16.c

diff --git a/sound/isa/sb/jazz16.c b/sound/isa/sb/jazz16.c
index 8d21a3feda3a9db19b384c2fc5e801fae5ca44fb..8ccbcddf08e19d11b153684caba68eeb72da6fac 100644 (file)
--- 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>