diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 16:08:46 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 16:08:46 +0000 |
| commit | 004c1c7096659d352b83047a7593e91d8a30e3c5 (patch) | |
| tree | 2801e22e945d2ca6016383348e16583918164526 /arch/arm/mach-s3c64xx | |
| parent | 882d01f96bc1909455696aae6eb7ce4df3e908c8 (diff) | |
| parent | 3b05007e43ea629394e89ea0b023d7b15375a2bb (diff) | |
| download | blackbird-op-linux-004c1c7096659d352b83047a7593e91d8a30e3c5.tar.gz blackbird-op-linux-004c1c7096659d352b83047a7593e91d8a30e3c5.zip | |
Merge branch 'for-rmk/samsung6' of git://git.fluff.org/bjdooks/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-s3c64xx')
| -rw-r--r-- | arch/arm/mach-s3c64xx/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/Makefile b/arch/arm/mach-s3c64xx/Makefile index d1d341a14f75..3758e15086be 100644 --- a/arch/arm/mach-s3c64xx/Makefile +++ b/arch/arm/mach-s3c64xx/Makefile @@ -57,6 +57,6 @@ obj-$(CONFIG_MACH_HMT) += mach-hmt.o obj-y += dev-uart.o obj-y += dev-rtc.o +obj-y += dev-audio.o obj-$(CONFIG_S3C_ADC) += dev-adc.o -obj-$(CONFIG_SND_S3C24XX_SOC) += dev-audio.o obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o |
