Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

All merge conflicts were simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

path: root/sound/pci/nm256/Makefile

#
# Makefile for ALSA
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
#

snd-nm256-objs := nm256.o

# Toplevel Module Dependency
obj-$(CONFIG_SND_NM256) += snd-nm256.o