From: Mark Brown Date: Fri, 5 Mar 2010 10:47:23 +0000 (+0000) Subject: ARM: S3C64XX: Reintroduce unconditional build of audio device X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0ea5357f2e02aa3741daddf71dd8b2f3b313db74;p=linux.git 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 Signed-off-by: Ben Dooks --- diff --git a/arch/arm/mach-s3c64xx/Makefile b/arch/arm/mach-s3c64xx/Makefile index d1d341a14f75e..3758e15086bed 100644 --- 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