diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
| commit | 56c5d900dbb8e042bfad035d18433476931d8f93 (patch) | |
| tree | 00b793965beeef10db03e0ff021d2d965c410759 /sound/usb/usx2y/Makefile | |
| parent | 4dd95b63ae25c5cad6986829b5e8788e9faa0330 (diff) | |
| parent | ead9d23d803ea3a73766c3cb27bf7563ac8d7266 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
sound/core/memalloc.c
Diffstat (limited to 'sound/usb/usx2y/Makefile')
| -rw-r--r-- | sound/usb/usx2y/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/usb/usx2y/Makefile b/sound/usb/usx2y/Makefile index 9ac22bce1124..748933054b6c 100644 --- a/sound/usb/usx2y/Makefile +++ b/sound/usb/usx2y/Makefile | |||
| @@ -1,3 +1,5 @@ | |||
| 1 | snd-usb-usx2y-objs := usbusx2y.o usX2Yhwdep.o usx2yhwdeppcm.o | 1 | snd-usb-usx2y-objs := usbusx2y.o usX2Yhwdep.o usx2yhwdeppcm.o |
| 2 | snd-usb-us122l-objs := us122l.o | ||
| 2 | 3 | ||
| 3 | obj-$(CONFIG_SND_USB_USX2Y) += snd-usb-usx2y.o | 4 | obj-$(CONFIG_SND_USB_USX2Y) += snd-usb-usx2y.o |
| 5 | obj-$(CONFIG_SND_USB_US122L) += snd-usb-us122l.o | ||