diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
| commit | 6dc6472581f693b5fc95aebedf67b4960fb85cf0 (patch) | |
| tree | 06a5a9a08519950575505273eabced331ed51405 /sound/usb/usx2y/Makefile | |
| parent | ee673eaa72d8d185012b1027a05e25aba18c267f (diff) | |
| parent | 8acd3a60bcca17c6d89c73cee3ad6057eb83ba1e (diff) | |
Merge commit 'origin'
Manual fixup of conflicts on:
arch/powerpc/include/asm/dcr-regs.h
drivers/net/ibm_newemac/core.h
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 | ||