diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-05 10:47:23 +0000 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-03-07 22:49:52 +0000 |
commit | 0ea5357f2e02aa3741daddf71dd8b2f3b313db74 (patch) | |
tree | 1e01f62b62365c224347269be5178a60214edf77 /arch/arm/mach-s3c64xx | |
parent | facf92695dcf40836973ce09b7f62d3cc3a89152 (diff) | |
download | talos-op-linux-0ea5357f2e02aa3741daddf71dd8b2f3b313db74.tar.gz talos-op-linux-0ea5357f2e02aa3741daddf71dd8b2f3b313db74.zip |
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>
Diffstat (limited to 'arch/arm/mach-s3c64xx')
-rw-r--r-- | arch/arm/mach-s3c64xx/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/Makefile b/arch/arm/mach-s3c64xx/Makefile index d1d341a14f75..3758e15086be 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 |