diff options
Diffstat (limited to 'arch/powerpc/configs/storcenter_defconfig')
-rw-r--r-- | arch/powerpc/configs/storcenter_defconfig | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/powerpc/configs/storcenter_defconfig b/arch/powerpc/configs/storcenter_defconfig index 8fc85747a0a7..fdbfd39a3aca 100644 --- a/arch/powerpc/configs/storcenter_defconfig +++ b/arch/powerpc/configs/storcenter_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.25-rc7 |
4 | # Mon Mar 24 08:48:41 2008 | 4 | # Mon Mar 31 11:37:19 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -717,8 +717,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
717 | # CONFIG_IPMI_HANDLER is not set | 717 | # CONFIG_IPMI_HANDLER is not set |
718 | CONFIG_HW_RANDOM=m | 718 | CONFIG_HW_RANDOM=m |
719 | CONFIG_NVRAM=y | 719 | CONFIG_NVRAM=y |
720 | CONFIG_GEN_RTC=y | 720 | # CONFIG_GEN_RTC is not set |
721 | # CONFIG_GEN_RTC_X is not set | ||
722 | # CONFIG_R3964 is not set | 721 | # CONFIG_R3964 is not set |
723 | # CONFIG_APPLICOM is not set | 722 | # CONFIG_APPLICOM is not set |
724 | # CONFIG_RAW_DRIVER is not set | 723 | # CONFIG_RAW_DRIVER is not set |
@@ -931,10 +930,6 @@ CONFIG_USB_STORAGE=y | |||
931 | # CONFIG_EDAC is not set | 930 | # CONFIG_EDAC is not set |
932 | CONFIG_RTC_LIB=y | 931 | CONFIG_RTC_LIB=y |
933 | CONFIG_RTC_CLASS=y | 932 | CONFIG_RTC_CLASS=y |
934 | |||
935 | # | ||
936 | # Conflicting RTC option has been selected, check GEN_RTC and RTC | ||
937 | # | ||
938 | CONFIG_RTC_HCTOSYS=y | 933 | CONFIG_RTC_HCTOSYS=y |
939 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | 934 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" |
940 | # CONFIG_RTC_DEBUG is not set | 935 | # CONFIG_RTC_DEBUG is not set |