From 08cf4db39f13e3b4621286a32a1dd01ad930ca91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
Date: Wed, 2 Dec 2009 19:54:31 +0100
Subject: [PATCH] --- yaml --- r: 176063 b: refs/heads/master c:
 be26d664de1a6333156bd586a2f795271cfcf170 h: refs/heads/master i:   176061:
 5f01421c5c977599d5255a2de6152a4d8836f138   176059:
 79bec0b47de45e57fc73aa103e6df592949c1485   176055:
 cb212f26b7e74edc04dbbe2ded5f37fe3c3194ed   176047:
 25162695c7391bc32ae0d95816e1eaefd366498e   176031:
 39314a9aff600b63c3e64be2979a5dc550fbb702   175999:
 de4611451d59fb3a872983585d7a07db9375faad v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/mfd/mc13783-core.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 98f68f1d67cd..b7fa196c54cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed89a7551c65e1db44f1a6b7be6efce178fc87d0
+refs/heads/master: be26d664de1a6333156bd586a2f795271cfcf170
diff --git a/trunk/drivers/mfd/mc13783-core.c b/trunk/drivers/mfd/mc13783-core.c
index dc1add0c4949..a1ade2324ea9 100644
--- a/trunk/drivers/mfd/mc13783-core.c
+++ b/trunk/drivers/mfd/mc13783-core.c
@@ -462,8 +462,8 @@ int mc13783_adc_do_conversion(struct mc13783 *mc13783, unsigned int mode,
 
 	switch (mode) {
 	case MC13783_ADC_MODE_TS:
-		adc0 |= MC13783_ADC0_ADREFEN | MC13783_ADC0_ADREFMODE
-			| MC13783_ADC0_TSMOD0 | MC13783_ADC0_TSMOD1;
+		adc0 |= MC13783_ADC0_ADREFEN | MC13783_ADC0_TSMOD0 |
+			MC13783_ADC0_TSMOD1;
 		adc1 |= 4 << MC13783_ADC1_CHAN1_SHIFT;
 		break;