diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-05-20 14:37:23 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-05-20 14:37:23 -0400 |
| commit | f6304f5804f228b6c2fea9e3dfac25c5b2db9b38 (patch) | |
| tree | 362b9b6a3bd32b868e5917a32d448ac75c5854df /arch/arm/mach-s3c64xx/Makefile | |
| parent | 4fa73a1bf89ebea4eba8a9982b5f64d266d8b5e9 (diff) | |
| parent | 6daa642d9b8ec762b3c5641cd5e5fa855a5405bf (diff) | |
Merge branch 'omap4-i2c-init' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-s3c64xx/Makefile')
| -rw-r--r-- | arch/arm/mach-s3c64xx/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c64xx/Makefile b/arch/arm/mach-s3c64xx/Makefile index 3758e15086be..a10f1fc6b023 100644 --- a/arch/arm/mach-s3c64xx/Makefile +++ b/arch/arm/mach-s3c64xx/Makefile | |||
| @@ -56,7 +56,6 @@ 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_S3C_ADC) += dev-adc.o | ||
| 62 | obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o | 60 | obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o |
| 61 | obj-$(CONFIG_S3C64XX_DEV_TS) += dev-ts.o | ||