diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-19 17:59:07 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-19 17:59:07 -0400 |
| commit | 4e9816d012dbc28dc89559261c6ffbf8ffc440dd (patch) | |
| tree | dee9f8b31f3d6d2fb141541da88e1cc1329b017e /include/linux/cpu.h | |
| parent | da98f44f27d81d7fe9a41f69af4fe08c18d13b56 (diff) | |
| parent | 1795cd9b3a91d4b5473c97f491d63892442212ab (diff) | |
Merge tag 'v3.16-rc5' into next/fixes-non-critical
Linux 3.16-rc5
Diffstat (limited to 'include/linux/cpu.h')
| -rw-r--r-- | include/linux/cpu.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/cpu.h b/include/linux/cpu.h index 81887120395c..95978ad7fcdd 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h | |||
| @@ -256,7 +256,6 @@ enum cpuhp_state { | |||
| 256 | }; | 256 | }; |
| 257 | 257 | ||
| 258 | void cpu_startup_entry(enum cpuhp_state state); | 258 | void cpu_startup_entry(enum cpuhp_state state); |
| 259 | void cpu_idle(void); | ||
| 260 | 259 | ||
| 261 | void cpu_idle_poll_ctrl(bool enable); | 260 | void cpu_idle_poll_ctrl(bool enable); |
| 262 | 261 | ||