---

yaml --- r: 251947 b: refs/heads/master c: ed13941 h: refs/heads/master i: 251945: 758a377 251943: f1f4126 v: v3
git-mirror · May 26, 2011 · ad948af · ad948af
1 parent 993e3fe
commit ad948af
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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