summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/86xx
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-04-02 13:57:46 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-04-02 13:57:46 +1000
commite31c6dfa8eb23ec7b3350b95ffe92f5a962d8c6b (patch)
treee897997d1844a712391772444817abc12d2bc3d6 /arch/powerpc/platforms/86xx
parentdd775ae2549217d3ae09363e3edb305d0fa19928 (diff)
parentfa1b42b45a9c96da77f3ddabf715f49525a87209 (diff)
Merge remote-tracking branch 'kumar/next' into merge
Diffstat (limited to 'arch/powerpc/platforms/86xx')
-rw-r--r--arch/powerpc/platforms/86xx/mpc8610_hpcd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
index bbc615206c6..62cd3c555bf 100644
--- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
+++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
@@ -225,7 +225,7 @@ void mpc8610hpcd_set_monitor_port(enum fsl_diu_monitor_port port)
void mpc8610hpcd_set_pixel_clock(unsigned int pixclock)
{
struct device_node *guts_np = NULL;
- struct ccsr_guts_86xx __iomem *guts;
+ struct ccsr_guts __iomem *guts;
unsigned long freq;
u64 temp;
u32 pxclk;