The Kconfig files for PowerPC CHRP and PMAC support had default=y for some
Kconfig options, and this caused support for CHRP and PMAC platforms to be
enabled incorrectly for several platforms. Fix the Kconfigs and the
affected defconfigs.
Signed-off-by: Timur Tabi [EMAIL PROTECTED]
---
This patch is for 2.6.28. Ben, please review and make sure I'm not being to
conservative or too aggressive. I don't know enough about CHRP and PMAC to
be sure I'm doing this right.
arch/powerpc/configs/83xx/asp8347_defconfig |2 --
arch/powerpc/configs/83xx/mpc8313_rdb_defconfig |2 --
arch/powerpc/configs/83xx/mpc8315_rdb_defconfig |2 --
arch/powerpc/configs/83xx/mpc832x_mds_defconfig |2 --
arch/powerpc/configs/83xx/mpc832x_rdb_defconfig |2 --
arch/powerpc/configs/83xx/mpc834x_itx_defconfig |2 --
arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig |2 --
arch/powerpc/configs/83xx/mpc834x_mds_defconfig |2 --
arch/powerpc/configs/83xx/mpc836x_mds_defconfig |2 --
arch/powerpc/configs/83xx/mpc836x_rdk_defconfig |2 --
arch/powerpc/configs/83xx/mpc837x_mds_defconfig |2 --
arch/powerpc/configs/83xx/mpc837x_rdb_defconfig |2 --
arch/powerpc/configs/83xx/sbc834x_defconfig |2 --
arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig |2 --
arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig |2 --
arch/powerpc/configs/86xx/sbc8641d_defconfig |2 --
arch/powerpc/configs/ep8248e_defconfig|2 --
arch/powerpc/configs/mpc8272_ads_defconfig|2 --
arch/powerpc/configs/mpc83xx_defconfig|2 --
arch/powerpc/configs/pq2fads_defconfig|2 --
arch/powerpc/platforms/chrp/Kconfig |1 -
arch/powerpc/platforms/powermac/Kconfig |4
22 files changed, 0 insertions(+), 45 deletions(-)
diff --git a/arch/powerpc/configs/83xx/asp8347_defconfig
b/arch/powerpc/configs/83xx/asp8347_defconfig
index 5e6780a..6638f5a 100644
--- a/arch/powerpc/configs/83xx/asp8347_defconfig
+++ b/arch/powerpc/configs/83xx/asp8347_defconfig
@@ -164,11 +164,9 @@ CONFIG_CLASSIC_RCU=y
#
CONFIG_PPC_MULTIPLATFORM=y
CONFIG_CLASSIC32=y
-CONFIG_PPC_CHRP=y
# CONFIG_MPC5121_ADS is not set
# CONFIG_MPC5121_GENERIC is not set
# CONFIG_PPC_MPC52xx is not set
-CONFIG_PPC_PMAC=y
# CONFIG_PPC_CELL is not set
# CONFIG_PPC_CELL_NATIVE is not set
# CONFIG_PPC_82xx is not set
diff --git a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
index 2028337..df125f3 100644
--- a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
@@ -163,11 +163,9 @@ CONFIG_CLASSIC_RCU=y
#
CONFIG_PPC_MULTIPLATFORM=y
CONFIG_CLASSIC32=y
-CONFIG_PPC_CHRP=y
# CONFIG_MPC5121_ADS is not set
# CONFIG_MPC5121_GENERIC is not set
# CONFIG_PPC_MPC52xx is not set
-CONFIG_PPC_PMAC=y
# CONFIG_PPC_CELL is not set
# CONFIG_PPC_CELL_NATIVE is not set
# CONFIG_PPC_82xx is not set
diff --git a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
index dd80eb0..6e0e08c 100644
--- a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
@@ -163,11 +163,9 @@ CONFIG_CLASSIC_RCU=y
#
CONFIG_PPC_MULTIPLATFORM=y
CONFIG_CLASSIC32=y
-CONFIG_PPC_CHRP=y
# CONFIG_MPC5121_ADS is not set
# CONFIG_MPC5121_GENERIC is not set
# CONFIG_PPC_MPC52xx is not set
-CONFIG_PPC_PMAC=y
# CONFIG_PPC_CELL is not set
# CONFIG_PPC_CELL_NATIVE is not set
# CONFIG_PPC_82xx is not set
diff --git a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
index bdf50c8..d6e204a 100644
--- a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
@@ -163,11 +163,9 @@ CONFIG_CLASSIC_RCU=y
#
CONFIG_PPC_MULTIPLATFORM=y
CONFIG_CLASSIC32=y
-CONFIG_PPC_CHRP=y
# CONFIG_MPC5121_ADS is not set
# CONFIG_MPC5121_GENERIC is not set
# CONFIG_PPC_MPC52xx is not set
-CONFIG_PPC_PMAC=y
# CONFIG_PPC_CELL is not set
# CONFIG_PPC_CELL_NATIVE is not set
# CONFIG_PPC_82xx is not set
diff --git a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
index 4eef8c9..1f3d343 100644
--- a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
@@ -163,11 +163,9 @@ CONFIG_CLASSIC_RCU=y
#
CONFIG_PPC_MULTIPLATFORM=y
CONFIG_CLASSIC32=y
-CONFIG_PPC_CHRP=y
# CONFIG_MPC5121_ADS is not set
# CONFIG_MPC5121_GENERIC is not set
# CONFIG_PPC_MPC52xx is not set
-CONFIG_PPC_PMAC=y
# CONFIG_PPC_CELL is not set
# CONFIG_PPC_CELL_NATIVE is not set
# CONFIG_PPC_82xx is not set
diff --git a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
index 8d65139..4686c21 100644
--- a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
+++