summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-samsung/Makefile
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2011-10-04 18:57:43 +0900
committerKukjin Kim <kgene.kim@samsung.com>2011-10-04 18:57:43 +0900
commit22be71ea8bf7e9f907e916bf9f6c2bbea9f42553 (patch)
treeedf517ccf09aec82c6a30e69ef885a785fa77167 /arch/arm/plat-samsung/Makefile
parent59ca37f74a6e9d3e9367359f2fcbb286df7d9748 (diff)
parentb391f8cf606679e97b02e3b9dca8a1d9956a5301 (diff)
downloadlinux-stable-22be71ea8bf7e9f907e916bf9f6c2bbea9f42553.tar.gz
linux-stable-22be71ea8bf7e9f907e916bf9f6c2bbea9f42553.tar.bz2
linux-stable-22be71ea8bf7e9f907e916bf9f6c2bbea9f42553.zip
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/Makefile2
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
obj-$(CONFIG_ARCH_USES_GETTIMEOFFSET) += time.o
obj-y += clock.o
obj-y += pwm-clock.o
-obj-y += gpio.o
-obj-y += gpio-config.o
obj-y += dev-asocdma.o
obj-$(CONFIG_SAMSUNG_CLKSRC) += clock-clksrc.o