diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-05 02:23:32 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-05 02:23:32 -0500 |
| commit | 36e632d61ae2febf55d5cd93b9e5ae0f5a5c6207 (patch) | |
| tree | 1dd1a6cd08f50c284588400c9e426aa8eba07c5e /sound | |
| parent | 767d75ad1c08c31646498a13837a5c59db90ccad (diff) | |
| parent | 2b9ddcb8b2ce6a44f0f969000f16b016caa64294 (diff) | |
Merge branch 'topic/misc' into topic/usb
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/isa/sb/jazz16.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/isa/sb/jazz16.c b/sound/isa/sb/jazz16.c index 8d21a3feda3a..8ccbcddf08e1 100644 --- a/sound/isa/sb/jazz16.c +++ b/sound/isa/sb/jazz16.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 16 | #include <linux/io.h> | 16 | #include <linux/io.h> |
| 17 | #include <linux/delay.h> | ||
| 17 | #include <asm/dma.h> | 18 | #include <asm/dma.h> |
| 18 | #include <linux/isa.h> | 19 | #include <linux/isa.h> |
| 19 | #include <sound/core.h> | 20 | #include <sound/core.h> |