diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-04-15 11:24:22 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-04-15 11:24:22 +0200 |
| commit | 00610a81df32ea50dba0105078e7369988caef3b (patch) | |
| tree | 808970164276f8b32c5016155c446e1e60c0c1c8 /sound/usb/caiaq/Makefile | |
| parent | 035f5afb022451b6b4f7ca1ff65a43d7ea8154a1 (diff) | |
| parent | 936e7d03394bc6238091db10d060326622c87ed7 (diff) | |
Merge branch 'topic/usb-caiaq' into for-linus
* topic/usb-caiaq:
ALSA: snd-usb-caiaq: rename files to remove redundant information in file pathes
ALSA: snd-usb-caiaq: clean up header includes
Diffstat (limited to 'sound/usb/caiaq/Makefile')
| -rw-r--r-- | sound/usb/caiaq/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/usb/caiaq/Makefile b/sound/usb/caiaq/Makefile index 23dadd5a11c..388999653aa 100644 --- a/sound/usb/caiaq/Makefile +++ b/sound/usb/caiaq/Makefile @@ -1,4 +1,4 @@ -snd-usb-caiaq-y := caiaq-device.o caiaq-audio.o caiaq-midi.o caiaq-control.o -snd-usb-caiaq-$(CONFIG_SND_USB_CAIAQ_INPUT) += caiaq-input.o +snd-usb-caiaq-y := device.o audio.o midi.o control.o +snd-usb-caiaq-$(CONFIG_SND_USB_CAIAQ_INPUT) += input.o obj-$(CONFIG_SND_USB_CAIAQ) += snd-usb-caiaq.o |