diff --git a/sound/Kconfig b/sound/Kconfig
index e48b9b37d228ddec3c0b4172ec493d70ee2f4db4..b2a2db47aff54820e02a635655f4c06ce8a92b1a 100644
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -63,6 +63,10 @@ source "sound/aoa/Kconfig"
 
 source "sound/arm/Kconfig"
 
+if SPI
+source "sound/spi/Kconfig"
+endif
+
 source "sound/mips/Kconfig"
 
 source "sound/sh/Kconfig"
diff --git a/sound/Makefile b/sound/Makefile
index 3ead922bd9c6f50b39e650c3e4172fe31798bf80..c76d70716fa537edccbe4ceada9b3eea1fbfa9f4 100644
--- a/sound/Makefile
+++ b/sound/Makefile
@@ -5,7 +5,8 @@ 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/ sh/ synth/ usb/ sparc/ parisc/ pcmcia/ mips/ soc/
+obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ \
+	sparc/ spi/ parisc/ pcmcia/ mips/ soc/
 obj-$(CONFIG_SND_AOA) += aoa/
 
 # 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 0000000000000000000000000000000000000000..60fbb2ad87a703a6c22fd4950c442e9d80f6393d
--- /dev/null
+++ b/sound/spi/Kconfig
@@ -0,0 +1,6 @@
+#SPI drivers
+
+menu "SPI devices"
+	depends on SND != n
+
+endmenu
diff --git a/sound/spi/Makefile b/sound/spi/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..30d8ec97cfb6a5eb70dd1dd92fe7d2cee4b6426a
--- /dev/null
+++ b/sound/spi/Makefile
@@ -0,0 +1,2 @@
+# Makefile for SPI drivers
+