diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2010-04-16 04:37:41 -0400 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2010-04-16 04:37:41 -0400 |
| commit | f09d045e2a61d2fdae3d0127208f18c9f44acf80 (patch) | |
| tree | edbe84444ac4e6f1d52aa87aef2e2e7d008fcb16 /sound/usb/usx2y | |
| parent | dc57da3875f527b1cc195ea4ce5bd32e1e68433d (diff) | |
| parent | 27762b2ce16d5c6f7bc8ab1aad1b9179076f997a (diff) | |
Merge branch 'topic/usb' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into devel
Diffstat (limited to 'sound/usb/usx2y')
| -rw-r--r-- | sound/usb/usx2y/us122l.c | 1 | ||||
| -rw-r--r-- | sound/usb/usx2y/usbusx2y.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sound/usb/usx2y/us122l.c b/sound/usb/usx2y/us122l.c index 9ca9a13a78da..6ef68e42138e 100644 --- a/sound/usb/usx2y/us122l.c +++ b/sound/usb/usx2y/us122l.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #define MODNAME "US122L" | 26 | #define MODNAME "US122L" |
| 27 | #include "usb_stream.c" | 27 | #include "usb_stream.c" |
| 28 | #include "../usbaudio.h" | 28 | #include "../usbaudio.h" |
| 29 | #include "../midi.h" | ||
| 29 | #include "us122l.h" | 30 | #include "us122l.h" |
| 30 | 31 | ||
| 31 | MODULE_AUTHOR("Karsten Wiese <fzu@wemgehoertderstaat.de>"); | 32 | MODULE_AUTHOR("Karsten Wiese <fzu@wemgehoertderstaat.de>"); |
diff --git a/sound/usb/usx2y/usbusx2y.h b/sound/usb/usx2y/usbusx2y.h index 1d174cea352b..e43c0a86441a 100644 --- a/sound/usb/usx2y/usbusx2y.h +++ b/sound/usb/usx2y/usbusx2y.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | #ifndef USBUSX2Y_H | 1 | #ifndef USBUSX2Y_H |
| 2 | #define USBUSX2Y_H | 2 | #define USBUSX2Y_H |
| 3 | #include "../usbaudio.h" | 3 | #include "../usbaudio.h" |
| 4 | #include "../midi.h" | ||
| 4 | #include "usbus428ctldefs.h" | 5 | #include "usbus428ctldefs.h" |
| 5 | 6 | ||
| 6 | #define NRURBS 2 | 7 | #define NRURBS 2 |