]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
ARM: S3C64XX: Make audio device code built unconditionally
authorBen Dooks <ben-linux@fluff.org>
Fri, 29 Jan 2010 04:03:34 +0000 (13:03 +0900)
committerBen Dooks <ben-linux@fluff.org>
Wed, 3 Feb 2010 01:55:03 +0000 (01:55 +0000)
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>
arch/arm/plat-s3c64xx/Makefile

index e60bde304d868194bbd51be7e233ca1e1c079398..33a73f3e9f01ba6b5278948f7072e887c616c986 100644 (file)
@@ -43,10 +43,13 @@ obj-$(CONFIG_S3C_ADC)               += dev-adc.o
 # SPI support
 obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o
 
+# Device support
+obj-y                          += dev-audio.o
+
 # Device setup
 
 obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o
 obj-$(CONFIG_S3C64XX_SETUP_I2C1) += setup-i2c1.o
 obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP) += setup-fb-24bpp.o
 obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
-obj-$(CONFIG_SND_S3C24XX_SOC) += dev-audio.o
+