diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-06-18 04:53:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-06-18 04:53:19 -0400 |
| commit | 646b1db4956ba8bf748b835b5eba211133d91c2e (patch) | |
| tree | 061166d873d9da9cf83044a7593ad111787076c5 /sound/usb/Makefile | |
| parent | 0f2c3de2ba110626515234d5d584fb1b0c0749a2 (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge commit 'v2.6.35-rc3' into perf/core
Merge reason: Go from -rc1 base to -rc3 base, merge in fixes.
Diffstat (limited to 'sound/usb/Makefile')
| -rw-r--r-- | sound/usb/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/usb/Makefile b/sound/usb/Makefile index e7ac7f493a8f..1e362bf8834f 100644 --- a/sound/usb/Makefile +++ b/sound/usb/Makefile | |||
| @@ -11,7 +11,8 @@ snd-usb-audio-objs := card.o \ | |||
| 11 | endpoint.o \ | 11 | endpoint.o \ |
| 12 | urb.o \ | 12 | urb.o \ |
| 13 | pcm.o \ | 13 | pcm.o \ |
| 14 | helper.o | 14 | helper.o \ |
| 15 | clock.o | ||
| 15 | 16 | ||
| 16 | snd-usbmidi-lib-objs := midi.o | 17 | snd-usbmidi-lib-objs := midi.o |
| 17 | 18 | ||