diff options
Diffstat (limited to 'arch/powerpc/configs/mpc8568mds_defconfig')
-rw-r--r-- | arch/powerpc/configs/mpc8568mds_defconfig | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/powerpc/configs/mpc8568mds_defconfig b/arch/powerpc/configs/mpc8568mds_defconfig index e7da4b96cde..2b866b38560 100644 --- a/arch/powerpc/configs/mpc8568mds_defconfig +++ b/arch/powerpc/configs/mpc8568mds_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:28 2008 | 4 | # Mon Mar 31 11:37:05 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -629,8 +629,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
629 | # CONFIG_IPMI_HANDLER is not set | 629 | # CONFIG_IPMI_HANDLER is not set |
630 | CONFIG_HW_RANDOM=y | 630 | CONFIG_HW_RANDOM=y |
631 | # CONFIG_NVRAM is not set | 631 | # CONFIG_NVRAM is not set |
632 | CONFIG_GEN_RTC=y | 632 | # CONFIG_GEN_RTC is not set |
633 | # CONFIG_GEN_RTC_X is not set | ||
634 | # CONFIG_R3964 is not set | 633 | # CONFIG_R3964 is not set |
635 | # CONFIG_APPLICOM is not set | 634 | # CONFIG_APPLICOM is not set |
636 | # CONFIG_RAW_DRIVER is not set | 635 | # CONFIG_RAW_DRIVER is not set |
@@ -825,10 +824,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
825 | # CONFIG_EDAC is not set | 824 | # CONFIG_EDAC is not set |
826 | CONFIG_RTC_LIB=y | 825 | CONFIG_RTC_LIB=y |
827 | CONFIG_RTC_CLASS=y | 826 | CONFIG_RTC_CLASS=y |
828 | |||
829 | # | ||
830 | # Conflicting RTC option has been selected, check GEN_RTC and RTC | ||
831 | # | ||
832 | CONFIG_RTC_HCTOSYS=y | 827 | CONFIG_RTC_HCTOSYS=y |
833 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | 828 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" |
834 | # CONFIG_RTC_DEBUG is not set | 829 | # CONFIG_RTC_DEBUG is not set |