diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-07-24 15:36:56 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-07-24 15:36:56 -0400 |
| commit | b9f12a5d97f652c77ef6803dccd0d40d1290f5be (patch) | |
| tree | 8f58c8620ffef0d350a5ec022feda492a96b179a /include/linux/cpu.h | |
| parent | 9d8dc3e529a19e427fd379118acd132520935c5d (diff) | |
| parent | 9a3c4145af32125c5ee39c0272662b47307a8323 (diff) | |
Merge tag 'v3.16-rc6' into next
Merge with mainline to bring in changes to MFD to allow merging
ipaq-micro-ts driver.
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 | ||