Commit 2b99c470 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 

Pull m68knommu fix from Greg Ungerer:
 "A single compile time fix"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k/coldfire: change pll var. to clk_pll
parents 4010a528 9f668611

arch/m68k/coldfire/m525x.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ DEFINE_CLK(pll, "pll.0", MCF_CLK); 
DEFINE_CLK(sys, "sys.0", MCF_BUSCLK);



static struct clk_lookup m525x_clk_lookup[] = {

	CLKDEV_INIT(NULL, "pll.0", &pll),

	CLKDEV_INIT(NULL, "pll.0", &clk_pll),

	CLKDEV_INIT(NULL, "sys.0", &clk_sys),

	CLKDEV_INIT("mcftmr.0", NULL, &clk_sys),

	CLKDEV_INIT("mcftmr.1", NULL, &clk_sys),