diff options
author | Timur Tabi <timur@freescale.com> | 2012-03-19 11:06:39 -0500 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2012-03-29 08:14:07 -0500 |
commit | 9cb6abcb2645985a886f36459d480f5163c57623 (patch) | |
tree | 4bf6445ba991559c285a3e952aba55b98dd8e8d7 /arch/powerpc/platforms/85xx/mpc85xx_rdb.c | |
parent | 1ce447b90f3e71c81ae59e0062bc305ef267668b (diff) | |
download | op-kernel-dev-9cb6abcb2645985a886f36459d480f5163c57623.zip op-kernel-dev-9cb6abcb2645985a886f36459d480f5163c57623.tar.gz |
powerpc/8xxx: remove 85xx/86xx restrictions from fsl_guts.h
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 <timur@freescale.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/85xx/mpc85xx_rdb.c')
-rw-r--r-- | arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c index db214cd..1a66c3d 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c @@ -128,7 +128,7 @@ static void __init mpc85xx_rdb_setup_arch(void) #if defined(CONFIG_UCC_GETH) || defined(CONFIG_SERIAL_QE) if (machine_is(p1025_rdb)) { - struct ccsr_guts_85xx __iomem *guts; + struct ccsr_guts __iomem *guts; np = of_find_node_by_name(NULL, "global-utilities"); if (np) { |