diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2009-06-23 16:34:35 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-06-23 16:34:35 +0100 |
| commit | b647712f669f4fadf428a14ab45ab4c03558cdf5 (patch) | |
| tree | 9b6c82de40cf14256660c74f0b277f5048f6583c /arch/arm | |
| parent | a3c79901170aba0d3717c2602326bab639eb1344 (diff) | |
| download | linux-3.10-b647712f669f4fadf428a14ab45ab4c03558cdf5.tar.gz linux-3.10-b647712f669f4fadf428a14ab45ab4c03558cdf5.tar.bz2 linux-3.10-b647712f669f4fadf428a14ab45ab4c03558cdf5.zip | |
[ARM] S3C: Fix S3C24XX build to not include s3c64xx IIS devices
Commit 52da219e9664e537a745877b0efa7cf2b1ff2996 added IIS
platform devices, but these do not build on s3c24xx systems
and the file depends on SND_S3C24XX_SOC, which is selected
for all S3C64XX/S3C24XX systems.
As a quick fix, make the dev-audio.o file depends on
SND_S3C64XX_SOC_I2S instead.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/plat-s3c/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c/Makefile b/arch/arm/plat-s3c/Makefile index 74bb7cb5da4..0761766b183 100644 --- a/arch/arm/plat-s3c/Makefile +++ b/arch/arm/plat-s3c/Makefile @@ -34,7 +34,7 @@ obj-$(CONFIG_S3C_DEV_HSMMC) += dev-hsmmc.o obj-$(CONFIG_S3C_DEV_HSMMC1) += dev-hsmmc1.o obj-y += dev-i2c0.o obj-$(CONFIG_S3C_DEV_I2C1) += dev-i2c1.o -obj-$(CONFIG_SND_S3C24XX_SOC) += dev-audio.o +obj-$(CONFIG_SND_S3C64XX_SOC_I2S) += dev-audio.o obj-$(CONFIG_S3C_DEV_FB) += dev-fb.o obj-$(CONFIG_S3C_DEV_USB_HOST) += dev-usb.o obj-$(CONFIG_S3C_DEV_USB_HSOTG) += dev-usb-hsotg.o |