diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-04-16 09:20:06 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-04-16 09:20:06 -0400 |
| commit | cf0dbba515415bb19b11f9323d5f7bebd7f24fd6 (patch) | |
| tree | 375bbc1ade1a92acd6493d224dd701fd7f209014 /sound/synth | |
| parent | 1cff399ecd9125d8e6a634a1957be1aeb3195a12 (diff) | |
| parent | 0340c7dccd80d8706c636e030a6ebbddbddca690 (diff) | |
Merge remote branch 'alsa/devel' into topic/misc
Diffstat (limited to 'sound/synth')
| -rw-r--r-- | sound/synth/emux/emux_proc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/synth/emux/emux_proc.c b/sound/synth/emux/emux_proc.c index 687e6a13689e..58a32a10d115 100644 --- a/sound/synth/emux/emux_proc.c +++ b/sound/synth/emux/emux_proc.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/wait.h> | 21 | #include <linux/wait.h> |
| 22 | #include <linux/slab.h> | ||
| 23 | #include <sound/core.h> | 22 | #include <sound/core.h> |
| 24 | #include <sound/emux_synth.h> | 23 | #include <sound/emux_synth.h> |
| 25 | #include <sound/info.h> | 24 | #include <sound/info.h> |