diff options
author | Boris Brezillon <boris.brezillon@bootlin.com> | 2018-04-04 22:13:35 +0200 |
---|---|---|
committer | Boris Brezillon <boris.brezillon@bootlin.com> | 2018-04-04 22:13:35 +0200 |
commit | fe5f31a8010a0cb13e72cfb72905fefa2a41730c (patch) | |
tree | 324d237e47092cc66b13c7421dbda6ea6961c6b4 /include/linux/cpuidle.h | |
parent | a88b5f38338db9cf2b8868e3645c30da655ac139 (diff) | |
parent | 91ab883eb21325ad80f3473633f794c78ac87f51 (diff) | |
download | op-kernel-dev-fe5f31a8010a0cb13e72cfb72905fefa2a41730c.zip op-kernel-dev-fe5f31a8010a0cb13e72cfb72905fefa2a41730c.tar.gz |
Merge tag 'v4.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mtd/next
Backmerge v4.16-rc2 into mtd/next to resolve a conflict between Linus'
master branch and nand/for-4.17.
Diffstat (limited to 'include/linux/cpuidle.h')
-rw-r--r-- | include/linux/cpuidle.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index 871f9e2..0b3fc22 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -225,7 +225,7 @@ static inline void cpuidle_coupled_parallel_barrier(struct cpuidle_device *dev, } #endif -#ifdef CONFIG_ARCH_HAS_CPU_RELAX +#if defined(CONFIG_CPU_IDLE) && defined(CONFIG_ARCH_HAS_CPU_RELAX) void cpuidle_poll_state_init(struct cpuidle_driver *drv); #else static inline void cpuidle_poll_state_init(struct cpuidle_driver *drv) {} |