diff --git a/[refs] b/[refs]
index b9055d05755f..a4bd8c9fecee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02856b5684677b74095069c3be4774c2992e4fdc
+refs/heads/master: 30833195ec8d2b8bcc17fb06659e91506edf5b63
diff --git a/trunk/sound/Makefile b/trunk/sound/Makefile
index a682ea30f0c9..1f60797afa8a 100644
--- a/trunk/sound/Makefile
+++ b/trunk/sound/Makefile
@@ -4,7 +4,8 @@
 obj-$(CONFIG_SOUND) += soundcore.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/ aoa/
+obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ synth/ usb/ sparc/ parisc/ pcmcia/ mips/
+obj-$(CONFIG_SND_AOA) += aoa/
 
 ifeq ($(CONFIG_SND),y)
   obj-y += last.o