summaryrefslogtreecommitdiffstats
path: root/arch/sparc/defconfig
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2007-07-22 00:37:48 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-07-24 13:24:32 -0700
commit2240598c24683df1e1a6cdd1f461efd85547903c (patch)
tree9e7d27a68d0bc3a88c7e1e86f2111c6b0fb9fce8 /arch/sparc/defconfig
parentb8c1c5da1520977cb55a358f20fc09567d40cad9 (diff)
downloadlinux-2240598c24683df1e1a6cdd1f461efd85547903c.tar.gz
linux-2240598c24683df1e1a6cdd1f461efd85547903c.tar.bz2
linux-2240598c24683df1e1a6cdd1f461efd85547903c.zip
[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>
Diffstat (limited to 'arch/sparc/defconfig')
-rw-r--r--arch/sparc/defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/defconfig b/arch/sparc/defconfig
index 38bd79fe6e75..fdc67238408a 100644
--- a/arch/sparc/defconfig
+++ b/arch/sparc/defconfig
@@ -600,7 +600,7 @@ CONFIG_LEGACY_PTY_COUNT=256
# 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