diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2008-03-31 12:53:46 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2008-03-31 12:53:46 -0400 |
commit | 1e85d89fa3954eff332033c0e75f6e2442be44ed (patch) | |
tree | ae5f8a670988d129accb1d2fe36c3f454b78633c /arch | |
parent | 049c9d45531d9825bf737891163a794fca1421c5 (diff) |
[POWERPC] Fix defconfigs so we dont set both GENRTC and RTCLIB
The new rtc subsystem conflicts with genrtc so don't enable GENRTC
if RTCLIB is enabled.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/configs/mpc832x_mds_defconfig | 11 | ||||
-rw-r--r-- | arch/powerpc/configs/mpc834x_mds_defconfig | 11 | ||||
-rw-r--r-- | arch/powerpc/configs/mpc836x_mds_defconfig | 11 | ||||
-rw-r--r-- | arch/powerpc/configs/mpc8544_ds_defconfig | 11 | ||||
-rw-r--r-- | arch/powerpc/configs/mpc8568mds_defconfig | 11 | ||||
-rw-r--r-- | arch/powerpc/configs/mpc8572_ds_defconfig | 11 | ||||
-rw-r--r-- | arch/powerpc/configs/mpc85xx_defconfig | 11 | ||||
-rw-r--r-- | arch/powerpc/configs/mpc8641_hpcn_defconfig | 11 | ||||
-rw-r--r-- | arch/powerpc/configs/prpmc2800_defconfig | 11 | ||||
-rw-r--r-- | arch/powerpc/configs/storcenter_defconfig | 11 |
10 files changed, 30 insertions, 80 deletions
diff --git a/arch/powerpc/configs/mpc832x_mds_defconfig b/arch/powerpc/configs/mpc832x_mds_defconfig index 79d228f84c5a..50cceda8994f 100644 --- a/arch/powerpc/configs/mpc832x_mds_defconfig +++ b/arch/powerpc/configs/mpc832x_mds_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:16 2008 | 4 | # Mon Mar 31 11:36:51 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -628,8 +628,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
628 | # CONFIG_IPMI_HANDLER is not set | 628 | # CONFIG_IPMI_HANDLER is not set |
629 | CONFIG_HW_RANDOM=y | 629 | CONFIG_HW_RANDOM=y |
630 | # CONFIG_NVRAM is not set | 630 | # CONFIG_NVRAM is not set |
631 | CONFIG_GEN_RTC=y | 631 | # CONFIG_GEN_RTC is not set |
632 | # CONFIG_GEN_RTC_X is not set | ||
633 | # CONFIG_R3964 is not set | 632 | # CONFIG_R3964 is not set |
634 | # CONFIG_APPLICOM is not set | 633 | # CONFIG_APPLICOM is not set |
635 | # CONFIG_RAW_DRIVER is not set | 634 | # CONFIG_RAW_DRIVER is not set |
@@ -824,10 +823,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
824 | # CONFIG_EDAC is not set | 823 | # CONFIG_EDAC is not set |
825 | CONFIG_RTC_LIB=y | 824 | CONFIG_RTC_LIB=y |
826 | CONFIG_RTC_CLASS=y | 825 | CONFIG_RTC_CLASS=y |
827 | |||
828 | # | ||
829 | # Conflicting RTC option has been selected, check GEN_RTC and RTC | ||
830 | # | ||
831 | CONFIG_RTC_HCTOSYS=y | 826 | CONFIG_RTC_HCTOSYS=y |
832 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | 827 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" |
833 | # CONFIG_RTC_DEBUG is not set | 828 | # CONFIG_RTC_DEBUG is not set |
diff --git a/arch/powerpc/configs/mpc834x_mds_defconfig b/arch/powerpc/configs/mpc834x_mds_defconfig index 9360144942f1..b4e82c0e2be7 100644 --- a/arch/powerpc/configs/mpc834x_mds_defconfig +++ b/arch/powerpc/configs/mpc834x_mds_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:20 2008 | 4 | # Mon Mar 31 11:36:56 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -571,8 +571,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
571 | # CONFIG_IPMI_HANDLER is not set | 571 | # CONFIG_IPMI_HANDLER is not set |
572 | # CONFIG_HW_RANDOM is not set | 572 | # CONFIG_HW_RANDOM is not set |
573 | # CONFIG_NVRAM is not set | 573 | # CONFIG_NVRAM is not set |
574 | CONFIG_GEN_RTC=y | 574 | # CONFIG_GEN_RTC is not set |
575 | # CONFIG_GEN_RTC_X is not set | ||
576 | # CONFIG_R3964 is not set | 575 | # CONFIG_R3964 is not set |
577 | # CONFIG_APPLICOM is not set | 576 | # CONFIG_APPLICOM is not set |
578 | # CONFIG_RAW_DRIVER is not set | 577 | # CONFIG_RAW_DRIVER is not set |
@@ -767,10 +766,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
767 | # CONFIG_EDAC is not set | 766 | # CONFIG_EDAC is not set |
768 | CONFIG_RTC_LIB=y | 767 | CONFIG_RTC_LIB=y |
769 | CONFIG_RTC_CLASS=y | 768 | CONFIG_RTC_CLASS=y |
770 | |||
771 | # | ||
772 | # Conflicting RTC option has been selected, check GEN_RTC and RTC | ||
773 | # | ||
774 | CONFIG_RTC_HCTOSYS=y | 769 | CONFIG_RTC_HCTOSYS=y |
775 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | 770 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" |
776 | # CONFIG_RTC_DEBUG is not set | 771 | # CONFIG_RTC_DEBUG is not set |
diff --git a/arch/powerpc/configs/mpc836x_mds_defconfig b/arch/powerpc/configs/mpc836x_mds_defconfig index 7c8b06046d5d..d50a96eddcdc 100644 --- a/arch/powerpc/configs/mpc836x_mds_defconfig +++ b/arch/powerpc/configs/mpc836x_mds_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:21 2008 | 4 | # Mon Mar 31 11:36:57 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -626,8 +626,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
626 | # CONFIG_IPMI_HANDLER is not set | 626 | # CONFIG_IPMI_HANDLER is not set |
627 | CONFIG_HW_RANDOM=y | 627 | CONFIG_HW_RANDOM=y |
628 | # CONFIG_NVRAM is not set | 628 | # CONFIG_NVRAM is not set |
629 | CONFIG_GEN_RTC=y | 629 | # CONFIG_GEN_RTC is not set |
630 | # CONFIG_GEN_RTC_X is not set | ||
631 | # CONFIG_R3964 is not set | 630 | # CONFIG_R3964 is not set |
632 | # CONFIG_APPLICOM is not set | 631 | # CONFIG_APPLICOM is not set |
633 | # CONFIG_RAW_DRIVER is not set | 632 | # CONFIG_RAW_DRIVER is not set |
@@ -822,10 +821,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
822 | # CONFIG_EDAC is not set | 821 | # CONFIG_EDAC is not set |
823 | CONFIG_RTC_LIB=y | 822 | CONFIG_RTC_LIB=y |
824 | CONFIG_RTC_CLASS=y | 823 | CONFIG_RTC_CLASS=y |
825 | |||
826 | # | ||
827 | # Conflicting RTC option has been selected, check GEN_RTC and RTC | ||
828 | # | ||
829 | CONFIG_RTC_HCTOSYS=y | 824 | CONFIG_RTC_HCTOSYS=y |
830 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | 825 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" |
831 | # CONFIG_RTC_DEBUG is not set | 826 | # CONFIG_RTC_DEBUG is not set |
diff --git a/arch/powerpc/configs/mpc8544_ds_defconfig b/arch/powerpc/configs/mpc8544_ds_defconfig index c75b6aee76d1..418bcdb5f919 100644 --- a/arch/powerpc/configs/mpc8544_ds_defconfig +++ b/arch/powerpc/configs/mpc8544_ds_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:26 2008 | 4 | # Mon Mar 31 11:37:03 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -742,8 +742,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
742 | # CONFIG_IPMI_HANDLER is not set | 742 | # CONFIG_IPMI_HANDLER is not set |
743 | # CONFIG_HW_RANDOM is not set | 743 | # CONFIG_HW_RANDOM is not set |
744 | CONFIG_NVRAM=y | 744 | CONFIG_NVRAM=y |
745 | CONFIG_GEN_RTC=y | 745 | # CONFIG_GEN_RTC is not set |
746 | CONFIG_GEN_RTC_X=y | ||
747 | # CONFIG_R3964 is not set | 746 | # CONFIG_R3964 is not set |
748 | # CONFIG_APPLICOM is not set | 747 | # CONFIG_APPLICOM is not set |
749 | # CONFIG_RAW_DRIVER is not set | 748 | # CONFIG_RAW_DRIVER is not set |
@@ -1209,10 +1208,6 @@ CONFIG_USB_MON=y | |||
1209 | # CONFIG_EDAC is not set | 1208 | # CONFIG_EDAC is not set |
1210 | CONFIG_RTC_LIB=y | 1209 | CONFIG_RTC_LIB=y |
1211 | CONFIG_RTC_CLASS=y | 1210 | CONFIG_RTC_CLASS=y |
1212 | |||
1213 | # | ||
1214 | # Conflicting RTC option has been selected, check GEN_RTC and RTC | ||
1215 | # | ||
1216 | CONFIG_RTC_HCTOSYS=y | 1211 | CONFIG_RTC_HCTOSYS=y |
1217 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | 1212 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" |
1218 | # CONFIG_RTC_DEBUG is not set | 1213 | # CONFIG_RTC_DEBUG is not set |
diff --git a/arch/powerpc/configs/mpc8568mds_defconfig b/arch/powerpc/configs/mpc8568mds_defconfig index e7da4b96cdeb..2b866b385607 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 |
diff --git a/arch/powerpc/configs/mpc8572_ds_defconfig b/arch/powerpc/configs/mpc8572_ds_defconfig index 460afe99c653..53aa6f3173a5 100644 --- a/arch/powerpc/configs/mpc8572_ds_defconfig +++ b/arch/powerpc/configs/mpc8572_ds_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:29 2008 | 4 | # Mon Mar 31 11:37:06 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -742,8 +742,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
742 | # CONFIG_IPMI_HANDLER is not set | 742 | # CONFIG_IPMI_HANDLER is not set |
743 | # CONFIG_HW_RANDOM is not set | 743 | # CONFIG_HW_RANDOM is not set |
744 | CONFIG_NVRAM=y | 744 | CONFIG_NVRAM=y |
745 | CONFIG_GEN_RTC=y | 745 | # CONFIG_GEN_RTC is not set |
746 | CONFIG_GEN_RTC_X=y | ||
747 | # CONFIG_R3964 is not set | 746 | # CONFIG_R3964 is not set |
748 | # CONFIG_APPLICOM is not set | 747 | # CONFIG_APPLICOM is not set |
749 | # CONFIG_RAW_DRIVER is not set | 748 | # CONFIG_RAW_DRIVER is not set |
@@ -1209,10 +1208,6 @@ CONFIG_USB_MON=y | |||
1209 | # CONFIG_EDAC is not set | 1208 | # CONFIG_EDAC is not set |
1210 | CONFIG_RTC_LIB=y | 1209 | CONFIG_RTC_LIB=y |
1211 | CONFIG_RTC_CLASS=y | 1210 | CONFIG_RTC_CLASS=y |
1212 | |||
1213 | # | ||
1214 | # Conflicting RTC option has been selected, check GEN_RTC and RTC | ||
1215 | # | ||
1216 | CONFIG_RTC_HCTOSYS=y | 1211 | CONFIG_RTC_HCTOSYS=y |
1217 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | 1212 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" |
1218 | # CONFIG_RTC_DEBUG is not set | 1213 | # CONFIG_RTC_DEBUG is not set |
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig index 615e4c1bf735..2075722911bb 100644 --- a/arch/powerpc/configs/mpc85xx_defconfig +++ b/arch/powerpc/configs/mpc85xx_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:31 2008 | 4 | # Mon Mar 31 11:37:08 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -750,8 +750,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
750 | # CONFIG_IPMI_HANDLER is not set | 750 | # CONFIG_IPMI_HANDLER is not set |
751 | # CONFIG_HW_RANDOM is not set | 751 | # CONFIG_HW_RANDOM is not set |
752 | CONFIG_NVRAM=y | 752 | CONFIG_NVRAM=y |
753 | CONFIG_GEN_RTC=y | 753 | # CONFIG_GEN_RTC is not set |
754 | CONFIG_GEN_RTC_X=y | ||
755 | # CONFIG_R3964 is not set | 754 | # CONFIG_R3964 is not set |
756 | # CONFIG_APPLICOM is not set | 755 | # CONFIG_APPLICOM is not set |
757 | # CONFIG_RAW_DRIVER is not set | 756 | # CONFIG_RAW_DRIVER is not set |
@@ -1217,10 +1216,6 @@ CONFIG_USB_MON=y | |||
1217 | # CONFIG_EDAC is not set | 1216 | # CONFIG_EDAC is not set |
1218 | CONFIG_RTC_LIB=y | 1217 | CONFIG_RTC_LIB=y |
1219 | CONFIG_RTC_CLASS=y | 1218 | CONFIG_RTC_CLASS=y |
1220 | |||
1221 | # | ||
1222 | # Conflicting RTC option has been selected, check GEN_RTC and RTC | ||
1223 | # | ||
1224 | CONFIG_RTC_HCTOSYS=y | 1219 | CONFIG_RTC_HCTOSYS=y |
1225 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | 1220 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" |
1226 | # CONFIG_RTC_DEBUG is not set | 1221 | # CONFIG_RTC_DEBUG is not set |
diff --git a/arch/powerpc/configs/mpc8641_hpcn_defconfig b/arch/powerpc/configs/mpc8641_hpcn_defconfig index 994e76817967..d01dcdb70bd7 100644 --- a/arch/powerpc/configs/mpc8641_hpcn_defconfig +++ b/arch/powerpc/configs/mpc8641_hpcn_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:34 2008 | 4 | # Mon Mar 31 11:37:11 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -736,8 +736,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
736 | # CONFIG_IPMI_HANDLER is not set | 736 | # CONFIG_IPMI_HANDLER is not set |
737 | # CONFIG_HW_RANDOM is not set | 737 | # CONFIG_HW_RANDOM is not set |
738 | CONFIG_NVRAM=y | 738 | CONFIG_NVRAM=y |
739 | CONFIG_GEN_RTC=y | 739 | # CONFIG_GEN_RTC is not set |
740 | CONFIG_GEN_RTC_X=y | ||
741 | # CONFIG_R3964 is not set | 740 | # CONFIG_R3964 is not set |
742 | # CONFIG_APPLICOM is not set | 741 | # CONFIG_APPLICOM is not set |
743 | # CONFIG_RAW_DRIVER is not set | 742 | # CONFIG_RAW_DRIVER is not set |
@@ -1203,10 +1202,6 @@ CONFIG_USB_MON=y | |||
1203 | # CONFIG_EDAC is not set | 1202 | # CONFIG_EDAC is not set |
1204 | CONFIG_RTC_LIB=y | 1203 | CONFIG_RTC_LIB=y |
1205 | CONFIG_RTC_CLASS=y | 1204 | CONFIG_RTC_CLASS=y |
1206 | |||
1207 | # | ||
1208 | # Conflicting RTC option has been selected, check GEN_RTC and RTC | ||
1209 | # | ||
1210 | CONFIG_RTC_HCTOSYS=y | 1205 | CONFIG_RTC_HCTOSYS=y |
1211 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | 1206 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" |
1212 | # CONFIG_RTC_DEBUG is not set | 1207 | # CONFIG_RTC_DEBUG is not set |
diff --git a/arch/powerpc/configs/prpmc2800_defconfig b/arch/powerpc/configs/prpmc2800_defconfig index f53d55bbdd7c..f9121685f11a 100644 --- a/arch/powerpc/configs/prpmc2800_defconfig +++ b/arch/powerpc/configs/prpmc2800_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:37 2008 | 4 | # Mon Mar 31 11:37:15 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -855,8 +855,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
855 | # CONFIG_IPMI_HANDLER is not set | 855 | # CONFIG_IPMI_HANDLER is not set |
856 | # CONFIG_HW_RANDOM is not set | 856 | # CONFIG_HW_RANDOM is not set |
857 | # CONFIG_NVRAM is not set | 857 | # CONFIG_NVRAM is not set |
858 | CONFIG_GEN_RTC=y | 858 | # CONFIG_GEN_RTC is not set |
859 | # CONFIG_GEN_RTC_X is not set | ||
860 | # CONFIG_R3964 is not set | 859 | # CONFIG_R3964 is not set |
861 | # CONFIG_APPLICOM is not set | 860 | # CONFIG_APPLICOM is not set |
862 | # CONFIG_RAW_DRIVER is not set | 861 | # CONFIG_RAW_DRIVER is not set |
@@ -1129,10 +1128,6 @@ CONFIG_USB_MON=y | |||
1129 | # CONFIG_EDAC is not set | 1128 | # CONFIG_EDAC is not set |
1130 | CONFIG_RTC_LIB=y | 1129 | CONFIG_RTC_LIB=y |
1131 | CONFIG_RTC_CLASS=y | 1130 | CONFIG_RTC_CLASS=y |
1132 | |||
1133 | # | ||
1134 | # Conflicting RTC option has been selected, check GEN_RTC and RTC | ||
1135 | # | ||
1136 | CONFIG_RTC_HCTOSYS=y | 1131 | CONFIG_RTC_HCTOSYS=y |
1137 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | 1132 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" |
1138 | # CONFIG_RTC_DEBUG is not set | 1133 | # CONFIG_RTC_DEBUG is not set |
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 |