diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-17 04:05:35 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-17 04:05:35 +0200 |
| commit | 815d469d8c9a3360ee0a8b7857dd95352a6c7bde (patch) | |
| tree | 14c3c910fe28855fc2e56882dce569699b2e520b /drivers/acpi | |
| parent | Merge branch 'for-5.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | clk: Remove io.h from clk-provider.h (diff) | |
| download | linux-815d469d8c9a3360ee0a8b7857dd95352a6c7bde.tar.xz linux-815d469d8c9a3360ee0a8b7857dd95352a6c7bde.zip | |
Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull more clk framework updates from Stephen Boyd:
"One more patch to remove io.h from clk-provider.h.
We used to need this include when we had clk_readl() and clk_writel(),
but those are gone now so this patch pushes the dependency out to the
users of clk-provider.h"
* tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
clk: Remove io.h from clk-provider.h
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/acpi_apd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/acpi_apd.c b/drivers/acpi/acpi_apd.c index ddf598ae8b6b..c16f9460c4a2 100644 --- a/drivers/acpi/acpi_apd.c +++ b/drivers/acpi/acpi_apd.c @@ -17,6 +17,7 @@ #include <linux/clkdev.h> #include <linux/acpi.h> #include <linux/err.h> +#include <linux/io.h> #include <linux/pm.h> #include "internal.h" |