diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:07:25 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:07:25 -0400 |
| commit | 14b8a0f92b309ff452a8c339abd9a096d00b210f (patch) | |
| tree | 0472637882c576873aae00207a07f9d178cdebd7 /arch/arm/mach-s3c64xx/Makefile | |
| parent | 05a690d2db5bd57d3c94293b06b69158535835df (diff) | |
| parent | adc0950c08e1f433f6933759f4facf9b2cf8d29d (diff) | |
ARM: Merge for-2635/samsung-rtc
Merge branch 'for-2635/samsung-rtc' into for-linus/samsung2
Conflicts:
arch/arm/mach-s3c64xx/include/mach/map.h
arch/arm/plat-samsung/Kconfig
arch/arm/plat-samsung/Makefile
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 da662783493a..d78c3dd43a1a 100644 --- a/arch/arm/mach-s3c64xx/Makefile +++ b/arch/arm/mach-s3c64xx/Makefile | |||
| @@ -56,6 +56,5 @@ obj-$(CONFIG_MACH_HMT) += mach-hmt.o | |||
| 56 | # device support | 56 | # device support |
| 57 | 57 | ||
| 58 | obj-y += dev-uart.o | 58 | obj-y += dev-uart.o |
| 59 | obj-y += dev-rtc.o | ||
| 60 | obj-y += dev-audio.o | 59 | obj-y += dev-audio.o |
| 61 | obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o | 60 | obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o |