ARM: S3C64XX: Reintroduce unconditional build of audio device

Ben Dooks' commit cf9814eb (ARM: S3C64XX: Make audio device code built
unconditionally) made the struct devices for the audio blocks in the
S3C64xx series processors be built unconditionally but this change seems
to have gone AWOL in the various Samsung platform moves this release
cycle, causing link failures with machine drivers that rely on it.

Reintroduce the change.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>

diff --git a/arch/arm/mach-s3c64xx/Makefile b/arch/arm/mach-s3c64xx/Makefile
index d1d341a14f75ed435b08565f029bdb8e66f7c963..3758e15086bedf11abbee9ef854f10b4ae4721bd 100644 (file)
--- a/arch/arm/mach-s3c64xx/Makefile
+++ b/arch/arm/mach-s3c64xx/Makefile
@@ -57,6 +57,6 @@ obj-$(CONFIG_MACH_HMT)                += mach-hmt.o
 
 obj-y                          += dev-uart.o
 obj-y                          += dev-rtc.o
+obj-y                          += dev-audio.o
 obj-$(CONFIG_S3C_ADC)          += dev-adc.o
-obj-$(CONFIG_SND_S3C24XX_SOC)  += dev-audio.o
 obj-$(CONFIG_S3C64XX_DEV_SPI)  += dev-spi.o