aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-01-28 23:03:34 -0500
committerBen Dooks <ben-linux@fluff.org>2010-02-02 20:55:03 -0500
commitcf9814eb6d83f066d5db63f4144598e9c6ca2951 (patch)
treef9b92d1d5d2721a8e08e1ee32d4c06799e909f7c
parent1de203adf6210b9dd81d907ea8cda587bc61cf4c (diff)
ARM: S3C64XX: Make audio device code built unconditionally
Making the code depend on CONFIG_SND_S3C24XX_SOC means that if the ASoC code is build modularily, the boards will fail to link due to the device code also being built as a module. As per Mark Brown's suggestions, just compile this always as it is expected many machines will have audio. Also move the obj-y line out of the device setup area into a new area just for devices. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
-rw-r--r--arch/arm/plat-s3c64xx/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c64xx/Makefile b/arch/arm/plat-s3c64xx/Makefile
index e60bde304d86..33a73f3e9f01 100644
--- a/arch/arm/plat-s3c64xx/Makefile
+++ b/arch/arm/plat-s3c64xx/Makefile
@@ -43,10 +43,13 @@ obj-$(CONFIG_S3C_ADC) += dev-adc.o
43# SPI support 43# SPI support
44obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o 44obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o
45 45
46# Device support
47obj-y += dev-audio.o
48
46# Device setup 49# Device setup
47 50
48obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o 51obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o
49obj-$(CONFIG_S3C64XX_SETUP_I2C1) += setup-i2c1.o 52obj-$(CONFIG_S3C64XX_SETUP_I2C1) += setup-i2c1.o
50obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP) += setup-fb-24bpp.o 53obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP) += setup-fb-24bpp.o
51obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o 54obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
52obj-$(CONFIG_SND_S3C24XX_SOC) += dev-audio.o 55