diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-29 16:32:35 -0500 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-29 16:32:35 -0500 |
| commit | 33edcf133ba93ecba2e4b6472e97b689895d805c (patch) | |
| tree | 327d7a20acef64005e7c5ccbfa1265be28aeb6ac /arch/x86/kernel/apm_32.c | |
| parent | be4d638c1597580ed2294d899d9f1a2cd10e462c (diff) | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/x86/kernel/apm_32.c')
| -rw-r--r-- | arch/x86/kernel/apm_32.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index 5145a6e72bbb..3a26525a3f31 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c | |||
| @@ -391,11 +391,7 @@ static int power_off; | |||
| 391 | #else | 391 | #else |
| 392 | static int power_off = 1; | 392 | static int power_off = 1; |
| 393 | #endif | 393 | #endif |
| 394 | #ifdef CONFIG_APM_REAL_MODE_POWER_OFF | ||
| 395 | static int realmode_power_off = 1; | ||
| 396 | #else | ||
| 397 | static int realmode_power_off; | 394 | static int realmode_power_off; |
| 398 | #endif | ||
| 399 | #ifdef CONFIG_APM_ALLOW_INTS | 395 | #ifdef CONFIG_APM_ALLOW_INTS |
| 400 | static int allow_ints = 1; | 396 | static int allow_ints = 1; |
| 401 | #else | 397 | #else |