Merge commit 'ccbf62d8a284cf181ac28c8e8407dd077d90dd4b' into for-next

[linux-2.6-block.git] / arch / x86 / kernel / apm_32.c

diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index f3a1f04ed4cb80794f539cb5e2fb1c3e7e803dd6..5848744514142c374174cdff06e3d7fe9f8cc793 100644 (file)
--- 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()) {