git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
sound
/
usb
/
Makefile
diff --git
a/sound/usb/Makefile
b/sound/usb/Makefile
index
2c1dc11
..
abb288b
100644
(file)
--- a/
sound/usb/Makefile
+++ b/
sound/usb/Makefile
@@
-8,5
+8,6
@@
snd-usb-lib-objs := usbmidi.o
# Toplevel Module Dependency
obj-$(CONFIG_SND_USB_AUDIO) += snd-usb-audio.o snd-usb-lib.o
obj-$(CONFIG_SND_USB_USX2Y) += snd-usb-lib.o
+obj-$(CONFIG_SND_USB_US122L) += snd-usb-lib.o
-obj-$(CONFIG_SND) += usx2y/
+obj-$(CONFIG_SND) += usx2y/
caiaq/