diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-18 12:24:24 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-18 12:24:41 -0500 |
| commit | d1c8b1bd093cb57860fb6446e096e1c1cda92d4d (patch) | |
| tree | 9c93ddf1ced6064a7f75a3f8a3691d09e624edb9 /include/linux/kernel.h | |
| parent | d13733f4a24d93c582f22f17b5434cf195b7d505 (diff) | |
| parent | 1b1ccee1e821e59c2a45c95b007aeb2c9dafd9be (diff) | |
Merge tag 's2mps11-build' into regulator-s5m8767 since a following patch
depend on it.
regulator/clk: Fix s2mps11 build
This patch fixes a build failure that appeared in v3.13-rc4 due to an
RTC/MFD update merged via -mm.
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index d4e98d13eff4..ecb87544cc5d 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
| @@ -193,7 +193,8 @@ extern int _cond_resched(void); | |||
| 193 | (__x < 0) ? -__x : __x; \ | 193 | (__x < 0) ? -__x : __x; \ |
| 194 | }) | 194 | }) |
| 195 | 195 | ||
| 196 | #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_DEBUG_ATOMIC_SLEEP) | 196 | #if defined(CONFIG_MMU) && \ |
| 197 | (defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_DEBUG_ATOMIC_SLEEP)) | ||
| 197 | void might_fault(void); | 198 | void might_fault(void); |
| 198 | #else | 199 | #else |
| 199 | static inline void might_fault(void) { } | 200 | static inline void might_fault(void) { } |