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.

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.
42062234 · Rafael J. Wysocki · cd3de83f · 53675abb · 42062234
Commit 42062234 authored Jul 09, 2014 by Rafael J. Wysocki
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

arch/x86/kernel/apm_32.c arch/x86/kernel/apm_32.c +0 -1

No files found.
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -841,7 +841,6 @@ static int apm_do_idle(void)
 	u32 eax;
 	u8 ret = 0;
 	int idled = 0;
-	int polling;
 	int err = 0;

 	if (!need_resched()) {