aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-04-30 01:08:45 (GMT)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-04-30 01:08:45 (GMT)
commit28bf41a1fedad76e9b4de70c9573bb3f8afc3709 (patch)
tree565c02208e36d682fb4f4776abc1390767633e90 /arch/powerpc/configs
parentfba2369e6ceb7ae688e91063821bae5140e26393 (diff)
parentfdeaf0e20e9f3999c5cb129e821595fe927bf259 (diff)
Merge remote-tracking branch 'agust/next' into next
From Anatolij Gustschin: << There are some changes for mpc5121 generic platform code to support mpc5125 SoC and DTS files for ac14xx and MPC5125-TWR boards. >>
Diffstat (limited to 'arch/powerpc/configs')
-rw-r--r--arch/powerpc/configs/mpc512x_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/configs/mpc512x_defconfig b/arch/powerpc/configs/mpc512x_defconfig
index 211fcc9..0d0d981 100644
--- a/arch/powerpc/configs/mpc512x_defconfig
+++ b/arch/powerpc/configs/mpc512x_defconfig
@@ -13,7 +13,7 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_PPC_CHRP is not set
CONFIG_PPC_MPC512x=y
CONFIG_MPC5121_ADS=y
-CONFIG_MPC5121_GENERIC=y
+CONFIG_MPC512x_GENERIC=y
CONFIG_PDM360NG=y
# CONFIG_PPC_PMAC is not set
CONFIG_NO_HZ=y

Privacy Policy