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 'x86/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
[pandora-kernel.git]
/
sound
/
soc
/
sh
/
Kconfig
diff --git
a/sound/soc/sh/Kconfig
b/sound/soc/sh/Kconfig
index
f03220d
..
54bd604
100644
(file)
--- a/
sound/soc/sh/Kconfig
+++ b/
sound/soc/sh/Kconfig
@@
-1,8
+1,9
@@
menu "SoC Audio support for SuperH"
menu "SoC Audio support for SuperH"
+ depends on SUPERH
config SND_SOC_PCM_SH7760
tristate "SoC Audio support for Renesas SH7760"
config SND_SOC_PCM_SH7760
tristate "SoC Audio support for Renesas SH7760"
- depends on CPU_SUBTYPE_SH7760 && S
ND_SOC && S
H_DMABRG
+ depends on CPU_SUBTYPE_SH7760 && SH_DMABRG
help
Enable this option for SH7760 AC97/I2S audio support.
help
Enable this option for SH7760 AC97/I2S audio support.
@@
-12,10
+13,9
@@
config SND_SOC_PCM_SH7760
##
config SND_SOC_SH4_HAC
##
config SND_SOC_SH4_HAC
+ tristate
select AC97_BUS
select SND_SOC_AC97_BUS
select AC97_BUS
select SND_SOC_AC97_BUS
- select SND_AC97_CODEC
- tristate
config SND_SOC_SH4_SSI
tristate
config SND_SOC_SH4_SSI
tristate