diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-09 08:46:07 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-09 08:46:07 -0400 |
| commit | 42062234cb7b4177ed6ed1a374b36356fc4d230f (patch) | |
| tree | 39193893acf273d2eb492989e103805ab8843de6 | |
| parent | cd3de83f147601356395b57a8673e9c5ff1e59d1 (diff) | |
| parent | 53675abbd1e54a30e621a9744bf9cce0712ddd6c (diff) | |
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.
| -rw-r--r-- | arch/x86/kernel/apm_32.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index f3a1f04ed4cb..584874451414 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c | |||
| @@ -841,7 +841,6 @@ static int apm_do_idle(void) | |||
| 841 | u32 eax; | 841 | u32 eax; |
| 842 | u8 ret = 0; | 842 | u8 ret = 0; |
| 843 | int idled = 0; | 843 | int idled = 0; |
| 844 | int polling; | ||
| 845 | int err = 0; | 844 | int err = 0; |
| 846 | 845 | ||
| 847 | if (!need_resched()) { | 846 | if (!need_resched()) { |