[PATCH 2/4] ARM: EXYNOS4: Update Kconfig and Makefile for s5p_timer

Sangbeom Kim sbkim73 at samsung.com
Mon Apr 4 20:28:43 EDT 2011


This patch add s5p_timer support configuration
and change Makefile for deleting useless object file.

Signed-off-by: Sangbeom Kim <sbkim73 at samsung.com>
---
 arch/arm/mach-exynos4/Kconfig  |    2 ++
 arch/arm/mach-exynos4/Makefile |    1 -
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig
index e849f67..f3bb2f2 100644
--- a/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@ -12,6 +12,7 @@ if ARCH_EXYNOS4
 config CPU_EXYNOS4210
 	bool
 	select S3C_PL330_DMA
+	select S5P_HRT
 	help
 	  Enable EXYNOS4210 CPU support
 
@@ -127,6 +128,7 @@ config MACH_SMDKV310
 	select EXYNOS4_DEV_SYSMMU
 	select EXYNOS4_SETUP_I2C1
 	select EXYNOS4_SETUP_KEYPAD
+	select SAMSUNG_DEV_PWM
 	select EXYNOS4_SETUP_SDHCI
 	help
 	  Machine support for Samsung SMDKV310
diff --git a/arch/arm/mach-exynos4/Makefile b/arch/arm/mach-exynos4/Makefile
index 9be104f..2583340 100644
--- a/arch/arm/mach-exynos4/Makefile
+++ b/arch/arm/mach-exynos4/Makefile
@@ -22,7 +22,6 @@ obj-$(CONFIG_SMP)		+= platsmp.o headsmp.o
 ifeq ($(CONFIG_EXYNOS4_MCT),y)
 obj-y				+= mct.o
 else
-obj-y				+= time.o
 obj-$(CONFIG_LOCAL_TIMERS)	+= localtimer.o
 endif
 
-- 
1.7.1




More information about the linux-arm-kernel mailing list