git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.20-rockchip-clk1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
drivers
/
clk
/
ti
/
clk-54xx.c
diff --git
a/drivers/clk/ti/clk-54xx.c
b/drivers/clk/ti/clk-54xx.c
index 5e183993e3ec56b926fffd252325000d02566d03..14160b2235480f1b2855a5c1f3d16865321ce18a 100644
(file)
--- a/
drivers/clk/ti/clk-54xx.c
+++ b/
drivers/clk/ti/clk-54xx.c
@@
-12,7
+12,7
@@
#include <linux/kernel.h>
#include <linux/list.h>
-#include <linux/clk
-private
.h>
+#include <linux/clk.h>
#include <linux/clkdev.h>
#include <linux/io.h>
#include <linux/clk/ti.h>