git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-fixes'
[pandora-kernel.git]
/
sound
/
sparc
/
Kconfig
diff --git
a/sound/sparc/Kconfig
b/sound/sparc/Kconfig
index
ef022a8
..
079e22a
100644
(file)
--- a/
sound/sparc/Kconfig
+++ b/
sound/sparc/Kconfig
@@
-7,7
+7,6
@@
config SND_SUN_AMD7930
tristate "Sun AMD7930"
depends on SBUS && SND
select SND_PCM
tristate "Sun AMD7930"
depends on SBUS && SND
select SND_PCM
- select SND_GENERIC_DRIVER
help
Say Y here to include support for AMD7930 sound device on Sun.
help
Say Y here to include support for AMD7930 sound device on Sun.
@@
-18,7
+17,6
@@
config SND_SUN_CS4231
tristate "Sun CS4231"
depends on SND
select SND_PCM
tristate "Sun CS4231"
depends on SND
select SND_PCM
- select SND_GENERIC_DRIVER
help
Say Y here to include support for CS4231 sound device on Sun.
help
Say Y here to include support for CS4231 sound device on Sun.
@@
-29,7
+27,6
@@
config SND_SUN_DBRI
tristate "Sun DBRI"
depends on SND && SBUS
select SND_PCM
tristate "Sun DBRI"
depends on SND && SBUS
select SND_PCM
- select SND_GENERIC_DRIVER
help
Say Y here to include support for DBRI sound device on Sun.
help
Say Y here to include support for DBRI sound device on Sun.