diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 11:05:42 +0200 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 11:05:42 +0200 |
| commit | 05a690d2db5bd57d3c94293b06b69158535835df (patch) | |
| tree | fb924faf327ae3d6b1f4a7cde96e007e9b32d7be /arch/arm/mach-s3c64xx/Makefile | |
| parent | ARM: Merge for-2635/s5p-audio (diff) | |
| parent | ARM: SAMSUNG: Moving ADC device definition to plat-samsung. (diff) | |
| download | linux-05a690d2db5bd57d3c94293b06b69158535835df.tar.xz linux-05a690d2db5bd57d3c94293b06b69158535835df.zip | |
ARM: Merge for-2635/samsung-ts
Merge branch 'for-2635/samsung-ts' into for-linus/samsung2
Diffstat (limited to 'arch/arm/mach-s3c64xx/Makefile')
| -rw-r--r-- | arch/arm/mach-s3c64xx/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/Makefile b/arch/arm/mach-s3c64xx/Makefile index 3758e15086be..da662783493a 100644 --- a/arch/arm/mach-s3c64xx/Makefile +++ b/arch/arm/mach-s3c64xx/Makefile @@ -58,5 +58,4 @@ 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_S3C64XX_DEV_SPI) += dev-spi.o |