Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / sound / oss / Makefile

diff --git a/sound/oss/Makefile b/sound/oss/Makefile
index 45b56473b4fbef30fca3e1296f9fba1ee914e13c..bd8fd056f7fcff4e8758c48557c0ba4bdc9eed49 100644 (file)
--- a/sound/oss/Makefile
+++ b/sound/oss/Makefile
@@ -14,7 +14,6 @@ obj-$(CONFIG_SOUND_OMAP_AIC23)  += omap-audio-aic23.o
 # Please leave it as is, cause the link order is significant !
 
 obj-$(CONFIG_SOUND_SH_DAC_AUDIO)       += sh_dac_audio.o
-obj-$(CONFIG_SOUND_HAL2)       += hal2.o
 obj-$(CONFIG_SOUND_AEDSP16)    += aedsp16.o
 obj-$(CONFIG_SOUND_PSS)                += pss.o ad1848.o mpu401.o
 obj-$(CONFIG_SOUND_TRIX)       += trix.o ad1848.o sb_lib.o uart401.o