diff options
| author | Mark Brown <broonie@kernel.org> | 2016-05-03 16:09:56 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-03 16:09:56 +0200 |
| commit | bc0868c62bb13834b20a864f684cced1f84a2412 (patch) | |
| tree | 2c382dcd24ac95f4dbf53d238d3161d6171d8a4b /drivers/clk/x86/clk-lpt.c | |
| parent | regulator: pwm: Try to avoid voltage error in duty cycle calculation (diff) | |
| parent | regulator: pwm: Use pwm_get_args() where appropriate (diff) | |
| download | linux-bc0868c62bb13834b20a864f684cced1f84a2412.tar.xz linux-bc0868c62bb13834b20a864f684cced1f84a2412.zip | |
Merge branch 'for-4.7/pwm-regulator' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm into regulator-pwm
Diffstat (limited to 'drivers/clk/x86/clk-lpt.c')
| -rw-r--r-- | drivers/clk/x86/clk-lpt.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/clk/x86/clk-lpt.c b/drivers/clk/x86/clk-lpt.c index f827083defc4..6b40eb89ae19 100644 --- a/drivers/clk/x86/clk-lpt.c +++ b/drivers/clk/x86/clk-lpt.c @@ -10,8 +10,6 @@ * published by the Free Software Foundation. */ -#include <linux/clk.h> -#include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/err.h> #include <linux/module.h> @@ -30,7 +28,7 @@ static int lpt_clk_probe(struct platform_device *pdev) /* LPSS free running clock */ drvdata->name = "lpss_clk"; clk = clk_register_fixed_rate(&pdev->dev, drvdata->name, NULL, - CLK_IS_ROOT, 100000000); + 0, 100000000); if (IS_ERR(clk)) return PTR_ERR(clk); |