diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-13 06:25:51 -0500 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-13 06:25:51 -0500 |
| commit | 968ea6d80e395cf11a51143cfa1b9a14ada676df (patch) | |
| tree | dc2acec8c9bdced33afe1e273ee5e0b0b93d2703 /arch/x86/kernel/apm_32.c | |
| parent | 7be7585393d311866653564fbcd10a3232773c0b (diff) | |
| parent | 8299608f140ae321e4eb5d1306184265d2b9511e (diff) | |
Merge ../linux-2.6-x86
Conflicts:
arch/x86/kernel/io_apic.c
kernel/sched.c
kernel/sched_stats.h
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 |