From: ben-linux@fluff.org (Ben Dooks)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: S3C64XX: Make audio device code built unconditionally
Date: Fri, 29 Jan 2010 04:14:19 +0000 [thread overview]
Message-ID: <1264738459-1972-7-git-send-email-ben-linux@fluff.org> (raw)
In-Reply-To: <1264738459-1972-1-git-send-email-ben-linux@fluff.org>
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 | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/arch/arm/plat-s3c64xx/Makefile b/arch/arm/plat-s3c64xx/Makefile
index e60bde3..33a73f3 100644
--- a/arch/arm/plat-s3c64xx/Makefile
+++ b/arch/arm/plat-s3c64xx/Makefile
@@ -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
+
--
1.6.0.4
prev parent reply other threads:[~2010-01-29 4:14 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-29 4:14 Samsung device updates Ben Dooks
2010-01-29 4:14 ` [PATCH] ARM: SAMSUNG: Add DMA masks to hsotg device Ben Dooks
2010-01-29 9:56 ` Sergei Shtylyov
2010-01-29 4:14 ` [PATCH] ARM: S3C64XX: SPI: Make platform device compilation selectable Ben Dooks
2010-01-29 4:14 ` [PATCH] ARM: S3C2412: SoC has the fractional baud rate register Ben Dooks
2010-01-29 4:14 ` [PATCH] ARM: SAMSUNG: Add SERIAL_SAMSUNG_UARTS_4 Kconfig option Ben Dooks
2010-01-29 4:14 ` [PATCH] ARM: SAMSUNG: Use PLAT_SAMSUNG instead of PLAT_S3C Ben Dooks
2010-01-29 4:14 ` Ben Dooks [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1264738459-1972-7-git-send-email-ben-linux@fluff.org \
--to=ben-linux@fluff.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).