Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm into pm-apm
Pull APM cleanup from Jiri Kosina.
This commit is contained in:
commit
42062234cb
@ -841,7 +841,6 @@ static int apm_do_idle(void)
|
|||||||
u32 eax;
|
u32 eax;
|
||||||
u8 ret = 0;
|
u8 ret = 0;
|
||||||
int idled = 0;
|
int idled = 0;
|
||||||
int polling;
|
|
||||||
int err = 0;
|
int err = 0;
|
||||||
|
|
||||||
if (!need_resched()) {
|
if (!need_resched()) {
|
||||||
|
Loading…
Reference in New Issue
Block a user