← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to sound/usb/Makefile

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno, Martin Michlmayr
  • Date: 2011-04-06 13:53:30 UTC
  • mfrom: (43.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110406135330-wjufxhd0tvn3zx4z
Tags: 2.6.38-3
http://bugs.debian.org/620124
http://bugs.debian.org/620284
http://bugs.debian.org/620204
[ Ben Hutchings ]
* [ppc64] Add to linux-tools package architectures (Closes: #620124)
* [amd64] Save cr4 to mmu_cr4_features at boot time (Closes: #620284)
* appletalk: Fix bugs introduced when removing use of BKL
* ALSA: Fix yet another race in disconnection
* cciss: Fix lost command issue
* ath9k: Fix kernel panic in AR2427
* ses: Avoid kernel panic when lun 0 is not mapped
* PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

[ Aurelien Jarno ]
* rtlwifi: fix build when PCI is not enabled.

[ Martin Michlmayr ]
* rtlwifi: Eliminate udelay calls with too large values (Closes: #620204)

Show diffs side-by-side

added added

removed removed

Lines of Context:
sound/usb/Makefile
2
2
# Makefile for ALSA
3
3
#
4
4
 
5
 
snd-usb-audio-objs := usbaudio.o usbmixer.o
6
 
snd-usb-lib-objs := usbmidi.o
 
5
snd-usb-audio-objs :=   card.o \
 
6
                        mixer.o \
 
7
                        mixer_quirks.o \
 
8
                        proc.o \
 
9
                        quirks.o \
 
10
                        format.o \
 
11
                        endpoint.o \
 
12
                        urb.o \
 
13
                        pcm.o \
 
14
                        helper.o \
 
15
                        clock.o
 
16
 
 
17
snd-usbmidi-lib-objs := midi.o
7
18
 
8
19
# Toplevel Module Dependency
9
 
obj-$(CONFIG_SND_USB_AUDIO) += snd-usb-audio.o snd-usb-lib.o
10
 
obj-$(CONFIG_SND_USB_USX2Y) += snd-usb-lib.o
11
 
obj-$(CONFIG_SND_USB_US122L) += snd-usb-lib.o
12
 
 
13
 
obj-$(CONFIG_SND) += usx2y/ caiaq/
 
20
obj-$(CONFIG_SND_USB_AUDIO) += snd-usb-audio.o snd-usbmidi-lib.o
 
21
 
 
22
obj-$(CONFIG_SND_USB_UA101) += snd-usbmidi-lib.o
 
23
obj-$(CONFIG_SND_USB_USX2Y) += snd-usbmidi-lib.o
 
24
obj-$(CONFIG_SND_USB_US122L) += snd-usbmidi-lib.o
 
25
 
 
26
obj-$(CONFIG_SND) += misc/ usx2y/ caiaq/