aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/Kconfig4
-rw-r--r--sound/Makefile3
-rw-r--r--sound/spi/Kconfig6
-rw-r--r--sound/spi/Makefile2
4 files changed, 14 insertions, 1 deletions
diff --git a/sound/Kconfig b/sound/Kconfig
index e48b9b37d228..b2a2db47aff5 100644
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -63,6 +63,10 @@ source "sound/aoa/Kconfig"
63 63
64source "sound/arm/Kconfig" 64source "sound/arm/Kconfig"
65 65
66if SPI
67source "sound/spi/Kconfig"
68endif
69
66source "sound/mips/Kconfig" 70source "sound/mips/Kconfig"
67 71
68source "sound/sh/Kconfig" 72source "sound/sh/Kconfig"
diff --git a/sound/Makefile b/sound/Makefile
index 3ead922bd9c6..c76d70716fa5 100644
--- a/sound/Makefile
+++ b/sound/Makefile
@@ -5,7 +5,8 @@ obj-$(CONFIG_SOUND) += soundcore.o
5obj-$(CONFIG_SOUND_PRIME) += sound_firmware.o 5obj-$(CONFIG_SOUND_PRIME) += sound_firmware.o
6obj-$(CONFIG_SOUND_PRIME) += oss/ 6obj-$(CONFIG_SOUND_PRIME) += oss/
7obj-$(CONFIG_DMASOUND) += oss/ 7obj-$(CONFIG_DMASOUND) += oss/
8obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ sparc/ parisc/ pcmcia/ mips/ soc/ 8obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ \
9 sparc/ spi/ parisc/ pcmcia/ mips/ soc/
9obj-$(CONFIG_SND_AOA) += aoa/ 10obj-$(CONFIG_SND_AOA) += aoa/
10 11
11# This one must be compilable even if sound is configured out 12# This one must be compilable even if sound is configured out
diff --git a/sound/spi/Kconfig b/sound/spi/Kconfig
new file mode 100644
index 000000000000..60fbb2ad87a7
--- /dev/null
+++ b/sound/spi/Kconfig
@@ -0,0 +1,6 @@
1#SPI drivers
2
3menu "SPI devices"
4 depends on SND != n
5
6endmenu
diff --git a/sound/spi/Makefile b/sound/spi/Makefile
new file mode 100644
index 000000000000..30d8ec97cfb6
--- /dev/null
+++ b/sound/spi/Makefile
@@ -0,0 +1,2 @@
1# Makefile for SPI drivers
2