diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-04-30 03:08:45 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-04-30 03:08:45 +0200 |
| commit | 28bf41a1fedad76e9b4de70c9573bb3f8afc3709 (patch) | |
| tree | 565c02208e36d682fb4f4776abc1390767633e90 /arch/powerpc/configs | |
| parent | mm: use vm_unmapped_area() on powerpc architecture (diff) | |
| parent | powerpc/512x: add ifm ac14xx board (diff) | |
| download | linux-28bf41a1fedad76e9b4de70c9573bb3f8afc3709.tar.xz linux-28bf41a1fedad76e9b4de70c9573bb3f8afc3709.zip | |
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_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/configs/mpc512x_defconfig b/arch/powerpc/configs/mpc512x_defconfig index 211fcc9ed700..0d0d981442fd 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 |