git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[XFS] Fix merge failures
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
apm_32.c
diff --git
a/arch/x86/kernel/apm_32.c
b/arch/x86/kernel/apm_32.c
index
5145a6e
..
3a26525
100644
(file)
--- a/
arch/x86/kernel/apm_32.c
+++ b/
arch/x86/kernel/apm_32.c
@@
-391,11
+391,7
@@
static int power_off;
#else
static int power_off = 1;
#endif
-#ifdef CONFIG_APM_REAL_MODE_POWER_OFF
-static int realmode_power_off = 1;
-#else
static int realmode_power_off;
-#endif
#ifdef CONFIG_APM_ALLOW_INTS
static int allow_ints = 1;
#else