Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e85d89f authored by Kumar Gala's avatar Kumar Gala
Browse files

[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: default avatarKumar Gala <galak@kernel.crashing.org>
parent 049c9d45

arch/powerpc/configs/mpc832x_mds_defconfig

+3 −8
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.25-rc6

# Mon Mar 24 08:48:16 2008

# Linux kernel version: 2.6.25-rc7

# Mon Mar 31 11:36:51 2008

#

# CONFIG_PPC64 is not set
@@ -628,8 +628,7 @@ CONFIG_LEGACY_PTY_COUNT=256 
# CONFIG_IPMI_HANDLER is not set

CONFIG_HW_RANDOM=y

# CONFIG_NVRAM is not set

CONFIG_GEN_RTC=y

# CONFIG_GEN_RTC_X is not set

# CONFIG_GEN_RTC is not set

# CONFIG_R3964 is not set

# CONFIG_APPLICOM is not set

# CONFIG_RAW_DRIVER is not set
@@ -824,10 +823,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y 
# CONFIG_EDAC is not set

CONFIG_RTC_LIB=y

CONFIG_RTC_CLASS=y



#

# Conflicting RTC option has been selected, check GEN_RTC and RTC

#

CONFIG_RTC_HCTOSYS=y

CONFIG_RTC_HCTOSYS_DEVICE="rtc0"

# CONFIG_RTC_DEBUG is not set

arch/powerpc/configs/mpc834x_mds_defconfig

+3 −8
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.25-rc6

# Mon Mar 24 08:48:20 2008

# Linux kernel version: 2.6.25-rc7

# Mon Mar 31 11:36:56 2008

#

# CONFIG_PPC64 is not set
@@ -571,8 +571,7 @@ CONFIG_LEGACY_PTY_COUNT=256 
# CONFIG_IPMI_HANDLER is not set

# CONFIG_HW_RANDOM is not set

# CONFIG_NVRAM is not set

CONFIG_GEN_RTC=y

# CONFIG_GEN_RTC_X is not set

# CONFIG_GEN_RTC is not set

# CONFIG_R3964 is not set

# CONFIG_APPLICOM is not set

# CONFIG_RAW_DRIVER is not set
@@ -767,10 +766,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y 
# CONFIG_EDAC is not set

CONFIG_RTC_LIB=y

CONFIG_RTC_CLASS=y



#

# Conflicting RTC option has been selected, check GEN_RTC and RTC

#

CONFIG_RTC_HCTOSYS=y

CONFIG_RTC_HCTOSYS_DEVICE="rtc0"

# CONFIG_RTC_DEBUG is not set

arch/powerpc/configs/mpc836x_mds_defconfig

+3 −8
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.25-rc6

# Mon Mar 24 08:48:21 2008

# Linux kernel version: 2.6.25-rc7

# Mon Mar 31 11:36:57 2008

#

# CONFIG_PPC64 is not set
@@ -626,8 +626,7 @@ CONFIG_LEGACY_PTY_COUNT=256 
# CONFIG_IPMI_HANDLER is not set

CONFIG_HW_RANDOM=y

# CONFIG_NVRAM is not set

CONFIG_GEN_RTC=y

# CONFIG_GEN_RTC_X is not set

# CONFIG_GEN_RTC is not set

# CONFIG_R3964 is not set

# CONFIG_APPLICOM is not set

# CONFIG_RAW_DRIVER is not set
@@ -822,10 +821,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y 
# CONFIG_EDAC is not set

CONFIG_RTC_LIB=y

CONFIG_RTC_CLASS=y



#

# Conflicting RTC option has been selected, check GEN_RTC and RTC

#

CONFIG_RTC_HCTOSYS=y

CONFIG_RTC_HCTOSYS_DEVICE="rtc0"

# CONFIG_RTC_DEBUG is not set

arch/powerpc/configs/mpc8544_ds_defconfig

+3 −8
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.25-rc6

# Mon Mar 24 08:48:26 2008

# Linux kernel version: 2.6.25-rc7

# Mon Mar 31 11:37:03 2008

#

# CONFIG_PPC64 is not set
@@ -742,8 +742,7 @@ CONFIG_LEGACY_PTY_COUNT=256 
# CONFIG_IPMI_HANDLER is not set

# CONFIG_HW_RANDOM is not set

CONFIG_NVRAM=y

CONFIG_GEN_RTC=y

CONFIG_GEN_RTC_X=y

# CONFIG_GEN_RTC is not set

# CONFIG_R3964 is not set

# CONFIG_APPLICOM is not set

# CONFIG_RAW_DRIVER is not set
@@ -1209,10 +1208,6 @@ CONFIG_USB_MON=y 
# CONFIG_EDAC is not set

CONFIG_RTC_LIB=y

CONFIG_RTC_CLASS=y



#

# Conflicting RTC option has been selected, check GEN_RTC and RTC

#

CONFIG_RTC_HCTOSYS=y

CONFIG_RTC_HCTOSYS_DEVICE="rtc0"

# CONFIG_RTC_DEBUG is not set

arch/powerpc/configs/mpc8568mds_defconfig

+3 −8
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.25-rc6

# Mon Mar 24 08:48:28 2008

# Linux kernel version: 2.6.25-rc7

# Mon Mar 31 11:37:05 2008

#

# CONFIG_PPC64 is not set
@@ -629,8 +629,7 @@ CONFIG_LEGACY_PTY_COUNT=256 
# CONFIG_IPMI_HANDLER is not set

CONFIG_HW_RANDOM=y

# CONFIG_NVRAM is not set

CONFIG_GEN_RTC=y

# CONFIG_GEN_RTC_X is not set

# CONFIG_GEN_RTC is not set

# CONFIG_R3964 is not set

# CONFIG_APPLICOM is not set

# CONFIG_RAW_DRIVER is not set
@@ -825,10 +824,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y 
# CONFIG_EDAC is not set

CONFIG_RTC_LIB=y

CONFIG_RTC_CLASS=y



#

# Conflicting RTC option has been selected, check GEN_RTC and RTC

#

CONFIG_RTC_HCTOSYS=y

CONFIG_RTC_HCTOSYS_DEVICE="rtc0"

# CONFIG_RTC_DEBUG is not set