commit 2240598c24683df1e1a6cdd1f461efd85547903c
author Al Viro <viro@zeniv.linux.org.uk> Sun Jul 22 00:37:48 2007 -0700
committer David S. Miller <davem@sunset.davemloft.net> Tue Jul 24 13:24:32 2007 -0700
tree 9e7d27a68d0bc3a88c7e1e86f2111c6b0fb9fce8
parent b8c1c5da1520977cb55a358f20fc09567d40cad9

[SPARC32]: Deal with rtc/sun_mostek_rtc conflict.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

arch/sparc/defconfig

diff --git a/arch/sparc/defconfig b/arch/sparc/defconfig
index 38bd79f..fdc6723 100644
--- a/arch/sparc/defconfig
+++ b/arch/sparc/defconfig
@@ -600,7 +600,7 @@
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=m
-CONFIG_RTC=m
+CONFIG_JS_RTC=m
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_DRM is not set