From 0cbc2582086a4209a874f5bbd935479bc72dca49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
Date: Sat, 31 Jan 2009 01:21:59 +0100
Subject: [PATCH] --- yaml --- r: 130838 b: refs/heads/master c:
 807a96cd0e5f5311e7f7a1030b43aab624cd7d9f h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/char/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e5b693f10180..00e6324579f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bcc8f3e01facc51b9d4f6351cd866f19eac0b5ae
+refs/heads/master: 807a96cd0e5f5311e7f7a1030b43aab624cd7d9f
diff --git a/trunk/drivers/char/Kconfig b/trunk/drivers/char/Kconfig
index f5be8081cd81..735bbe2be51a 100644
--- a/trunk/drivers/char/Kconfig
+++ b/trunk/drivers/char/Kconfig
@@ -761,7 +761,7 @@ source "drivers/char/hw_random/Kconfig"
 
 config NVRAM
 	tristate "/dev/nvram support"
-	depends on ATARI || X86 || ARM || GENERIC_NVRAM
+	depends on ATARI || X86 || (ARM && RTC_DRV_CMOS) || GENERIC_NVRAM
 	---help---
 	  If you say Y here and create a character special file /dev/nvram
 	  with major number 10 and minor number 144 using mknod ("man mknod"),