summaryrefslogtreecommitdiff
path: root/sound/spi/Makefile
blob: 026fb73f887f74b4e76754fb5cf07355d6abc8fe (plain)
1
2
3
4
5
# Makefile for SPI drivers

snd-at73c213-objs		:= at73c213.o

obj-$(CONFIG_SND_AT73C213)	+= snd-at73c213.o
class='ctrl'>
Diffstat (limited to 'net/bluetooth/hidp/core.c')
-0500
commit3efa70d78f218e4c9276b0bac0545e5184c1c47b (patch)
treef4abe2f05e173023d2a262afd4aebb1e89fe6985 /net/6lowpan/nhc_ipv6.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/6lowpan/nhc_ipv6.c')