From ad948afe5718f8061221e473bcca9fd2013f6736 Mon Sep 17 00:00:00 2001 From: Johan Palsson Date: Sun, 8 May 2011 00:55:43 +0200 Subject: [PATCH] --- yaml --- r: 251947 b: refs/heads/master c: ed13941643a437cf48f24ed53bdae79457628105 h: refs/heads/master i: 251945: 758a377ce55b141b9937cb3aa93389af57d741e8 251943: f1f4126cf94b10ffb4bd0e1ee91fe3d7eef98c8f v: v3 --- [refs] | 2 +- trunk/drivers/mfd/ab8500-gpadc.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f1114abe87e8..8fa7f92740fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c9c9513fd08d1e0548003e86d70a211c2e456d49 +refs/heads/master: ed13941643a437cf48f24ed53bdae79457628105 diff --git a/trunk/drivers/mfd/ab8500-gpadc.c b/trunk/drivers/mfd/ab8500-gpadc.c index 82708c1f316d..f16afb234ff9 100644 --- a/trunk/drivers/mfd/ab8500-gpadc.c +++ b/trunk/drivers/mfd/ab8500-gpadc.c @@ -57,7 +57,7 @@ #define SW_AVG_16 0x60 #define ADC_SW_CONV 0x04 #define EN_ICHAR 0x80 -#define BATTEMP_PULLUP 0x04 +#define BTEMP_PULL_UP 0x08 #define EN_BUF 0x40 #define DIS_ZERO 0x00 #define GPADC_BUSY 0x01 @@ -306,8 +306,8 @@ int ab8500_gpadc_convert(struct ab8500_gpadc *gpadc, u8 input) ret = abx500_mask_and_set_register_interruptible( gpadc->dev, AB8500_GPADC, AB8500_GPADC_CTRL1_REG, - EN_BUF | BATTEMP_PULLUP, - EN_BUF | BATTEMP_PULLUP); + EN_BUF | BTEMP_PULL_UP, + EN_BUF | BTEMP_PULL_UP); /* * Delay might be needed for ABB8500 cut 3.0, if not, remove