diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2015-07-28 18:58:26 (GMT) |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2015-07-28 18:58:26 (GMT) |
| commit | 4d341056202a4725777ed99897f6456405819cd4 (patch) | |
| tree | 45fb9d229bacf995aabcad282937568e5201b5a7 /drivers/clk/ti/clk-54xx.c | |
| parent | e306479ac252928b84cc563c6e790f9b7e7ae427 (diff) | |
| parent | 989feafb84118a840ff21250a1e5f516f43e3dbb (diff) | |
| download | linux-4d341056202a4725777ed99897f6456405819cd4.tar.xz | |
Merge branch 'for-4.2/ti-clk-move' of https://github.com/t-kristo/linux-pm into clk-next
From Tero Kristo:
"This pull request contains the TI clock driver set to move the
clock implementations under clock driver. Some small portions of
the clock driver code still remain under mach-omap2 after this,
it should be decided whether this code is now obsolete and should
be deleted or should someone try to fix it."
Slight merge conflicts with determine_rate prototype changes.
Diffstat (limited to 'drivers/clk/ti/clk-54xx.c')
| -rw-r--r-- | drivers/clk/ti/clk-54xx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/clk/ti/clk-54xx.c b/drivers/clk/ti/clk-54xx.c index 96c69a3..59ce2fa 100644 --- a/drivers/clk/ti/clk-54xx.c +++ b/drivers/clk/ti/clk-54xx.c @@ -17,6 +17,8 @@ #include <linux/io.h> #include <linux/clk/ti.h> +#include "clock.h" + #define OMAP5_DPLL_ABE_DEFFREQ 98304000 /* |