diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 05:57:43 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 05:57:43 -0400 |
| commit | 22be71ea8bf7e9f907e916bf9f6c2bbea9f42553 (patch) | |
| tree | edf517ccf09aec82c6a30e69ef885a785fa77167 /arch/arm/plat-samsung/Makefile | |
| parent | 59ca37f74a6e9d3e9367359f2fcbb286df7d9748 (diff) | |
| parent | b391f8cf606679e97b02e3b9dca8a1d9956a5301 (diff) | |
Merge branch 'next/topic-gpio-samsung' into next-samsung-devel
Diffstat (limited to 'arch/arm/plat-samsung/Makefile')
| -rw-r--r-- | arch/arm/plat-samsung/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile index 90758494cad8..5ed2b2be0c7e 100644 --- a/arch/arm/plat-samsung/Makefile +++ b/arch/arm/plat-samsung/Makefile | |||
| @@ -15,8 +15,6 @@ obj-y += init.o | |||
| 15 | obj-$(CONFIG_ARCH_USES_GETTIMEOFFSET) += time.o | 15 | obj-$(CONFIG_ARCH_USES_GETTIMEOFFSET) += time.o |
| 16 | obj-y += clock.o | 16 | obj-y += clock.o |
| 17 | obj-y += pwm-clock.o | 17 | obj-y += pwm-clock.o |
| 18 | obj-y += gpio.o | ||
| 19 | obj-y += gpio-config.o | ||
| 20 | obj-y += dev-asocdma.o | 18 | obj-y += dev-asocdma.o |
| 21 | 19 | ||
| 22 | obj-$(CONFIG_SAMSUNG_CLKSRC) += clock-clksrc.o | 20 | obj-$(CONFIG_SAMSUNG_CLKSRC) += clock-clksrc.o |