diff --git a/[refs] b/[refs]
index b1ff58770ac4..0ecb53a1fc51 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ede028f8716523fc31e0d3d01b81405613dfb8f
+refs/heads/master: 6c7578bb0a631d018a68e5f90554f29fbd928055
diff --git a/trunk/sound/Kconfig b/trunk/sound/Kconfig
index 200aca1faa71..1eceb85287c5 100644
--- a/trunk/sound/Kconfig
+++ b/trunk/sound/Kconfig
@@ -60,6 +60,8 @@ source "sound/aoa/Kconfig"
 
 source "sound/arm/Kconfig"
 
+source "sound/atmel/Kconfig"
+
 source "sound/spi/Kconfig"
 
 source "sound/mips/Kconfig"
diff --git a/trunk/sound/Makefile b/trunk/sound/Makefile
index c76d70716fa5..ec467decfa79 100644
--- a/trunk/sound/Makefile
+++ b/trunk/sound/Makefile
@@ -6,7 +6,7 @@ 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/ spi/ parisc/ pcmcia/ mips/ soc/
+	sparc/ spi/ parisc/ pcmcia/ mips/ soc/ atmel/
 obj-$(CONFIG_SND_AOA) += aoa/
 
 # This one must be compilable even if sound is configured out