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
Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
em-x270.c
diff --git
a/arch/arm/mach-pxa/em-x270.c
b/arch/arm/mach-pxa/em-x270.c
index
63b10d9
..
9cd0946
100644
(file)
--- a/
arch/arm/mach-pxa/em-x270.c
+++ b/
arch/arm/mach-pxa/em-x270.c
@@
-1141,12
+1141,16
@@
struct power_supply_info em_x270_psy_info = {
static void em_x270_battery_low(void)
{
static void em_x270_battery_low(void)
{
+#if defined(CONFIG_APM_EMULATION)
apm_queue_event(APM_LOW_BATTERY);
apm_queue_event(APM_LOW_BATTERY);
+#endif
}
static void em_x270_battery_critical(void)
{
}
static void em_x270_battery_critical(void)
{
+#if defined(CONFIG_APM_EMULATION)
apm_queue_event(APM_CRITICAL_SUSPEND);
apm_queue_event(APM_CRITICAL_SUSPEND);
+#endif
}
struct da9030_battery_info em_x270_batterty_info = {
}
struct da9030_battery_info em_x270_batterty_info = {