From: David Brownell <david-b@pacbell.net>
Date: Wed, 28 Mar 2007 20:21:20 +0000 (-0700)
Subject: ARM: OMAP: restore CONFIG_GENERIC_TIME
X-Git-Tag: v2.6.22-omap1~180^2~62
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=469aa26bcc82af5867fc3bf0f770faae3d5dd008;p=linux-2.6-omap-h63xx.git

ARM: OMAP: restore CONFIG_GENERIC_TIME

Somehow this got lost in a merge ...

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 0d8fac3b037..d7c0984d4a8 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -354,6 +354,7 @@ config ARCH_SA1100
 config ARCH_S3C2410
 	bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443"
 	select GENERIC_GPIO
+	select GENERIC_TIME
 	help
 	  Samsung S3C2410X CPU based systems, such as the Simtec Electronics
 	  BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or