diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-04-02 05:57:46 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-04-02 05:57:46 +0200 |
| commit | e31c6dfa8eb23ec7b3350b95ffe92f5a962d8c6b (patch) | |
| tree | e897997d1844a712391772444817abc12d2bc3d6 /arch/powerpc/platforms/86xx | |
| parent | Linux 3.4-rc1 (diff) | |
| parent | powerpc/qe: Update the SNUM table for MPC8569 Rev2.0 (diff) | |
| download | linux-e31c6dfa8eb23ec7b3350b95ffe92f5a962d8c6b.tar.xz linux-e31c6dfa8eb23ec7b3350b95ffe92f5a962d8c6b.zip | |
Merge remote-tracking branch 'kumar/next' into merge
Diffstat (limited to 'arch/powerpc/platforms/86xx')
| -rw-r--r-- | arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 2 |
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 bbc615206c67..62cd3c555bfb 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; |