diff options
author | Mike Turquette <mturquette@linaro.org> | 2014-02-24 22:21:29 -0800 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2014-02-24 22:21:29 -0800 |
commit | 10b7cdc0084c27a312e59e80420c6aac70c64753 (patch) | |
tree | ee891d6236bcd8dc988624839760aaa1846cf906 /arch/arm/mach-tegra/pm.c | |
parent | clk: Correct handling of NULL clk in __clk_{get, put} (diff) | |
parent | clk: shmobile: Fix typo in MSTP clock DT bindings (diff) | |
download | linux-dev-10b7cdc0084c27a312e59e80420c6aac70c64753.tar.xz linux-dev-10b7cdc0084c27a312e59e80420c6aac70c64753.zip |
Merge branch 'clocks/fixes/drivers' of git://linuxtv.org/pinchartl/fbdev into clk-fixes
Diffstat (limited to 'arch/arm/mach-tegra/pm.c')
-rw-r--r-- | arch/arm/mach-tegra/pm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/pm.c b/arch/arm/mach-tegra/pm.c index 4ae0286b468d..f55b05a29b55 100644 --- a/arch/arm/mach-tegra/pm.c +++ b/arch/arm/mach-tegra/pm.c @@ -24,6 +24,7 @@ #include <linux/cpu_pm.h> #include <linux/suspend.h> #include <linux/err.h> +#include <linux/slab.h> #include <linux/clk/tegra.h> #include <asm/smp_plat.h> |