summaryrefslogtreecommitdiff
path: root/sound/isa/es1688/Makefile
blob: aee1e4ddb22ad243a18d4653d5002f125ee4e465 (plain)
1
2
3
4
5
6
7
8
9
10
11
#
# Makefile for ALSA
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
#

snd-es1688-lib-objs := es1688_lib.o
snd-es1688-objs := es1688.o

# Toplevel Module Dependency
obj-$(CONFIG_SND_ES1688) += snd-es1688.o snd-es1688-lib.o
obj-$(CONFIG_SND_GUSEXTREME) += snd-es1688-lib.o
cgi/linux/net-next.git/commit/net/smc/smc_cdc.h?id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>3efa70d78f218e4c9276b0bac0545e5184c1c47b (patch) treef4abe2f05e173023d2a262afd4aebb1e89fe6985 /net/smc/smc_cdc.h 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/smc/smc_cdc.h')