diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2007-07-22 03:37:48 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-24 16:24:32 -0400 |
| commit | 2240598c24683df1e1a6cdd1f461efd85547903c (patch) | |
| tree | 9e7d27a68d0bc3a88c7e1e86f2111c6b0fb9fce8 /arch/sparc/defconfig | |
| parent | b8c1c5da1520977cb55a358f20fc09567d40cad9 (diff) | |
[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/defconfig | 2 |
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 | |||
| 600 | # CONFIG_IPMI_HANDLER is not set | 600 | # CONFIG_IPMI_HANDLER is not set |
| 601 | # CONFIG_WATCHDOG is not set | 601 | # CONFIG_WATCHDOG is not set |
| 602 | CONFIG_HW_RANDOM=m | 602 | CONFIG_HW_RANDOM=m |
| 603 | CONFIG_RTC=m | 603 | CONFIG_JS_RTC=m |
| 604 | # CONFIG_R3964 is not set | 604 | # CONFIG_R3964 is not set |
| 605 | # CONFIG_APPLICOM is not set | 605 | # CONFIG_APPLICOM is not set |
| 606 | # CONFIG_DRM is not set | 606 | # CONFIG_DRM is not set |