On Mar 19, 2012, at 11:06 AM, Timur Tabi wrote: > Remove the check for CONFIG_PPC_85xx and CONFIG_PPC_86xx from fsl_guts.h. > The check was originally intended to allow the same header file to > be used on 85xx and 86xx systems, even though the Global Utilities > register could be different. It turns out that they're not actually > different, and so the check is not necessary. In addition, neither > macro is defined for 64-bit e5500 kernels, so that causes a build > break. > > Signed-off-by: Timur Tabi <ti...@freescale.com> > --- > > The ASoC part of this patch applies cleanly to the ASoC for-3.4 branch, > so this patch should not cause any merge conflicts if carried on the > PowerPC branch, so I suggest that Kumar pick this up for 3.4 (it fixes a > potential 64-bit book-e build break), with an ACK from Mark. > > arch/powerpc/include/asm/fsl_guts.h | 26 +++++--------------------- > arch/powerpc/platforms/85xx/mpc85xx_mds.c | 2 +- > arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 2 +- > arch/powerpc/platforms/85xx/p1022_ds.c | 4 ++-- > arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 2 +- > sound/soc/fsl/mpc8610_hpcd.c | 8 ++++---- > sound/soc/fsl/p1022_ds.c | 10 +++++----- > 7 files changed, 19 insertions(+), 35 deletions(-)
applied - k _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
