summaryrefslogtreecommitdiff
path: root/sound/pci/trident/Makefile
blob: 88676b50f385edb7fd0c47f502f9a0da9030ed54 (plain)
1
2
3
4
5
6
7
8
9
#
# Makefile for ALSA
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
#

snd-trident-objs := trident.o trident_main.o trident_memory.o

# Toplevel Module Dependency
obj-$(CONFIG_SND_TRIDENT) += snd-trident.o
'> authorDavid S. Miller <davem@davemloft.net>2017-02-07 16:29:30 -0500 committerDavid S. Miller <davem@davemloft.net>2017-02-07 16:29:30 -0500 commit3efa70d78f218e4c9276b0bac0545e5184c1c47b (patch) treef4abe2f05e173023d2a262afd4aebb1e89fe6985 /net/bluetooth/rfcomm/tty.c parent76e0e70e6452b971a69cc9794ff4a6715c11f7f2 (diff)parent926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bluetooth/rfcomm/tty.c')