aboutsummaryrefslogtreecommitdiff
path: root/drivers/power/mxs/linux.c
diff options
context:
space:
mode:
authorZhou Jingyu <b02241@freescale.com>2010-03-26 14:52:10 +0800
committerZhou Jingyu <b02241@freescale.com>2010-03-26 15:42:21 +0800
commitb29c1776959bf4e763be8f6f328dc45a60859c72 (patch)
tree93876b23f8bcc649e85cc69ff797f7536f27fea2 /drivers/power/mxs/linux.c
parent9d15f10eb2db4670ef97915e950c18cf227e0343 (diff)
downloadlinux-linaro-b29c1776959bf4e763be8f6f328dc45a60859c72.tar.gz
ENGR00122040 mxs battery driver: fix lradc conflict
use configurable lraadc channel for tempreture increase conditioning current fix build warnings Signed-off-by: Zhou Jingyu <Jingyu.Zhou@freescale.com>
Diffstat (limited to 'drivers/power/mxs/linux.c')
-rw-r--r--drivers/power/mxs/linux.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/power/mxs/linux.c b/drivers/power/mxs/linux.c
index f878f8ebd45..ce8b0e3ed75 100644
--- a/drivers/power/mxs/linux.c
+++ b/drivers/power/mxs/linux.c
@@ -1053,6 +1053,7 @@ static struct platform_driver mxs_batdrv = {
},
};
+#ifdef POWER_FIQ
static int power_relinquish(void *data, int relinquish)
{
return -1;
@@ -1068,6 +1069,7 @@ extern char power_fiq_start[], power_fiq_end[];
extern void lock_vector_tlb(void *);
extern long power_fiq_count;
static struct proc_dir_entry *power_fiq_proc;
+#endif
static int __init mxs_bat_init(void)
{