diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-08-17 19:16:28 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-08-17 19:16:28 +0200 |
| commit | 29c08460d472e427cec5e5dcb12ec74c923f8250 (patch) | |
| tree | 9d8557fe9cf123920c3ceb023274e763e5f208b0 /arch/arm/plat-s3c64xx/Makefile | |
| parent | Merge branch 'for-rmk-2.6.32' of git://git.pengutronix.de/git/ukl/linux-2.6 i... (diff) | |
| parent | ARM: Show FIQ in /proc/interrupts on CONFIG_FIQ (diff) | |
| download | linux-29c08460d472e427cec5e5dcb12ec74c923f8250.tar.xz linux-29c08460d472e427cec5e5dcb12ec74c923f8250.zip | |
Merge branch 'next-s3c' of git://aeryn.fluff.org.uk/bjdooks/linux into devel-stable
Diffstat (limited to 'arch/arm/plat-s3c64xx/Makefile')
| -rw-r--r-- | arch/arm/plat-s3c64xx/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c64xx/Makefile b/arch/arm/plat-s3c64xx/Makefile index 3c8882cd6268..b85b4359e935 100644 --- a/arch/arm/plat-s3c64xx/Makefile +++ b/arch/arm/plat-s3c64xx/Makefile @@ -40,4 +40,5 @@ obj-$(CONFIG_S3C64XX_DMA) += dma.o 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
\ No newline at end of file +obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o +obj-$(CONFIG_SND_S3C24XX_SOC) += dev-audio.o |