diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 07:18:36 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 07:18:36 -0400 |
| commit | db3c94a7edc6b29f8d52ba5884dec6a15feeadad (patch) | |
| tree | ac9207a44cecafb9104ca4e1f46aecb9fe01383d /arch/arm/mach-s3c64xx/Makefile | |
| parent | c9477f38cba225870862fd9e08868ae3d4abdfe0 (diff) | |
| parent | 568f0e278c6dd33dc11bd19c4ad781d1f8d86800 (diff) | |
Merge branch 'next-samsung-devel' into next-samsung-devel-2
Conflicts:
arch/arm/mach-exynos4/clock.c
arch/arm/mach-s3c2412/gpio.c
arch/arm/mach-s5p64x0/dma.c
arch/arm/mach-s5p64x0/gpiolib.c
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 61b4034a0c22..902ab9ace93b 100644 --- a/arch/arm/mach-s3c64xx/Makefile +++ b/arch/arm/mach-s3c64xx/Makefile | |||
| @@ -13,7 +13,6 @@ obj- := | |||
| 13 | # Core files | 13 | # Core files |
| 14 | obj-y += cpu.o | 14 | obj-y += cpu.o |
| 15 | obj-y += clock.o | 15 | obj-y += clock.o |
| 16 | obj-y += gpiolib.o | ||
| 17 | 16 | ||
| 18 | # Core support for S3C6400 system | 17 | # Core support for S3C6400 system |
| 19 | 18 | ||
| @@ -55,7 +54,7 @@ obj-$(CONFIG_MACH_HMT) += mach-hmt.o | |||
| 55 | obj-$(CONFIG_MACH_SMARTQ) += mach-smartq.o | 54 | obj-$(CONFIG_MACH_SMARTQ) += mach-smartq.o |
| 56 | obj-$(CONFIG_MACH_SMARTQ5) += mach-smartq5.o | 55 | obj-$(CONFIG_MACH_SMARTQ5) += mach-smartq5.o |
| 57 | obj-$(CONFIG_MACH_SMARTQ7) += mach-smartq7.o | 56 | obj-$(CONFIG_MACH_SMARTQ7) += mach-smartq7.o |
| 58 | obj-$(CONFIG_MACH_WLF_CRAGG_6410) += mach-crag6410.o | 57 | obj-$(CONFIG_MACH_WLF_CRAGG_6410) += mach-crag6410.o mach-crag6410-module.o |
| 59 | 58 | ||
| 60 | # device support | 59 | # device support |
| 61 | 60 | ||