diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-04-02 07:57:46 +0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-04-02 07:57:46 +0400 |
commit | e31c6dfa8eb23ec7b3350b95ffe92f5a962d8c6b (patch) | |
tree | e897997d1844a712391772444817abc12d2bc3d6 /arch/powerpc/platforms/85xx/mpc85xx_rdb.c | |
parent | dd775ae2549217d3ae09363e3edb305d0fa19928 (diff) | |
parent | fa1b42b45a9c96da77f3ddabf715f49525a87209 (diff) | |
download | linux-e31c6dfa8eb23ec7b3350b95ffe92f5a962d8c6b.tar.xz |
Merge remote-tracking branch 'kumar/next' into merge
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 9848f9e39853..313fce4f5574 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c @@ -127,7 +127,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) { |