diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
| commit | 53279f36dccffc26ff536003fd6bb97cc21c3b82 (patch) | |
| tree | 9d16e497c0e4158c7c054c479bd0e9ff0388d7bb /include/sound/seq_kernel.h | |
| parent | a6e8c0a25377e27958b11b20e1927885ae7c9857 (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes
Diffstat (limited to 'include/sound/seq_kernel.h')
| -rw-r--r-- | include/sound/seq_kernel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/seq_kernel.h b/include/sound/seq_kernel.h index f352a98ce4f4..2398521f0998 100644 --- a/include/sound/seq_kernel.h +++ b/include/sound/seq_kernel.h | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | * | 22 | * |
| 23 | */ | 23 | */ |
| 24 | #include <linux/time.h> | 24 | #include <linux/time.h> |
| 25 | #include "asequencer.h" | 25 | #include <sound/asequencer.h> |
| 26 | 26 | ||
| 27 | typedef struct snd_seq_real_time snd_seq_real_time_t; | 27 | typedef struct snd_seq_real_time snd_seq_real_time_t; |
| 28 | typedef union snd_seq_timestamp snd_seq_timestamp_t; | 28 | typedef union snd_seq_timestamp snd_seq_timestamp_t; |