diff options
| -rw-r--r-- | sound/Kconfig | 2 | ||||
| -rw-r--r-- | sound/Makefile | 2 | ||||
| -rw-r--r-- | sound/soc/Kconfig | 19 | ||||
| -rw-r--r-- | sound/soc/Makefile | 4 |
4 files changed, 26 insertions, 1 deletions
diff --git a/sound/Kconfig b/sound/Kconfig index 9d77300746c..97532bbc2cc 100644 --- a/sound/Kconfig +++ b/sound/Kconfig @@ -76,6 +76,8 @@ source "sound/sparc/Kconfig" source "sound/parisc/Kconfig" +source "sound/soc/Kconfig" + endmenu menu "Open Sound System" diff --git a/sound/Makefile b/sound/Makefile index 9aee54c4882..b7c7fb7c24c 100644 --- a/sound/Makefile +++ b/sound/Makefile @@ -5,7 +5,7 @@ obj-$(CONFIG_SOUND) += soundcore.o obj-$(CONFIG_SOUND_PRIME) += sound_firmware.o obj-$(CONFIG_SOUND_PRIME) += oss/ obj-$(CONFIG_DMASOUND) += oss/ -obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ synth/ usb/ sparc/ parisc/ pcmcia/ mips/ +obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ synth/ usb/ sparc/ parisc/ pcmcia/ mips/ soc/ obj-$(CONFIG_SND_AOA) += aoa/ # This one must be compilable even if sound is configured out diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig new file mode 100644 index 00000000000..200709f4b70 --- /dev/null +++ b/sound/soc/Kconfig @@ -0,0 +1,19 @@ +# +# SoC audio configuration +# + +menu "SoC audio support" + depends on SND!=n + +config SND_SOC + tristate "SoC audio support" + ---help--- + + If you want SoC support, you should say Y here and also to the + specific driver for your SoC below. You will also need to select the + specific codec(s) attached to the SoC + + This SoC audio support can also be built as a module. If so, the module + will be called snd-soc-core. + +endmenu diff --git a/sound/soc/Makefile b/sound/soc/Makefile new file mode 100644 index 00000000000..b211ee63fd7 --- /dev/null +++ b/sound/soc/Makefile @@ -0,0 +1,4 @@ +snd-soc-core-objs := soc-core.o soc-dapm.o + +obj-$(CONFIG_SND_SOC) += snd-soc-core.o + |