summaryrefslogtreecommitdiff
path: root/drivers/clk/ti/fixed-factor.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.com>2015-09-05 12:07:04 +0300
committerNeilBrown <neilb@suse.com>2015-09-05 12:08:32 +0300
commite89c6fdf9e0eb1b5a03574d4ca73e83eae8deb91 (patch)
treef9df292ed03a5a3c4ddc658ae3646f02a1ffafce /drivers/clk/ti/fixed-factor.c
parentc3cce6cda162eb2b2960a85d9c8992f4f3be85d0 (diff)
parent1081230b748de8f03f37f80c53dfa89feda9b8de (diff)
downloadlinux-e89c6fdf9e0eb1b5a03574d4ca73e83eae8deb91.tar.xz
Merge linux-block/for-4.3/core into md/for-linux
There were a few conflicts that are fairly easy to resolve. Signed-off-by: NeilBrown <neilb@suse.com>
Diffstat (limited to 'drivers/clk/ti/fixed-factor.c')
-rw-r--r--drivers/clk/ti/fixed-factor.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/clk/ti/fixed-factor.c b/drivers/clk/ti/fixed-factor.c
index c2c8a287408c..3cd406768909 100644
--- a/drivers/clk/ti/fixed-factor.c
+++ b/drivers/clk/ti/fixed-factor.c
@@ -22,6 +22,8 @@
#include <linux/of_address.h>
#include <linux/clk/ti.h>
+#include "clock.h"
+
#undef pr_fmt
#define pr_fmt(fmt) "%s: " fmt, __func__