diff options
| author | Linus Torvalds | 2021-07-29 09:28:24 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2021-07-29 09:28:24 -0700 |
| commit | 2b99c470d50ae01df37c40596f4be58f1d41db06 (patch) | |
| tree | f3eaaec9e3120339873a4783d988782daf957efa /arch | |
| parent | 4010a528219e01dd02e768b22168f7f0e78365ce (diff) | |
| parent | 9f66861181e64dc192bea136da6c91528910002e (diff) | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m68k/coldfire/m525x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/coldfire/m525x.c b/arch/m68k/coldfire/m525x.c index 2c4d2ca2f20d..485375112e28 100644 --- a/arch/m68k/coldfire/m525x.c +++ b/arch/m68k/coldfire/m525x.c @@ -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), |