# ALSA Sparc drivers
menuconfig SND_SPARC
bool "Sparc sound devices"
depends on SPARC
default y
help
Support for sound devices specific to Sun SPARC architectures.
if SND_SPARC
config SND_SUN_AMD7930
tristate "Sun AMD7930"
depends on SBUS
select SND_PCM
help
Say Y here to include support for AMD7930 sound device on Sun.
To compile this driver as a module, choose M here: the module
will be called snd-sun-amd7930.
config SND_SUN_CS4231
tristate "Sun CS4231"
select SND_PCM
select SND_TIMER
help
Say Y here to include support for CS4231 sound device on Sun.
To compile this driver as a module, choose M here: the module
will be called snd-sun-cs4231.
config SND_SUN_DBRI
tristate "Sun DBRI"
depends on SBUS
select SND_PCM
help
Say Y here to include support for DBRI sound device on Sun.
To compile this driver as a module, choose M here: the module
will be called snd-sun-dbri.
endif # SND_SPARC
get'>
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
Pull namespace fixes from Eric Biederman:
"This tree contains 4 fixes.
The first is a fix for a race that can causes oopses under the right
circumstances, and that someone just recently encountered.
Past that are several small trivial correct fixes. A real issue that
was blocking development of an out of tree driver, but does not appear
to have caused any actual problems for in-tree code. A potential
deadlock that was reported by lockdep. And a deadlock people have
experienced and took the time to track down caused by a cleanup that
removed the code to drop a reference count"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
sysctl: Drop reference added by grab_header in proc_sys_readdir
pid: fix lockdep deadlock warning due to ucount_lock
libfs: Modify mount_pseudo_xattr to be clear it is not a userspace mount
mnt: Protect the mountpoint hashtable with mount_lock