Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[~andy/linux] / include / linux / mfd / pcf50633 / adc.h

diff --git a/include/linux/mfd/pcf50633/adc.h b/include/linux/mfd/pcf50633/adc.h
index 56669b4183ad7a6a7763edafe727761ac514498a..b35e62801ffa1d81be6d1984073d6b8485a67f5e 100644 (file)
--- a/include/linux/mfd/pcf50633/adc.h
+++ b/include/linux/mfd/pcf50633/adc.h
@@ -25,7 +25,8 @@
 #define PCF50633_REG_ADCS3             0x57
 
 #define PCF50633_ADCC1_ADCSTART                0x01
-#define PCF50633_ADCC1_RES_10BIT       0x02
+#define PCF50633_ADCC1_RES_8BIT                0x02
+#define PCF50633_ADCC1_RES_10BIT       0x00
 #define PCF50633_ADCC1_AVERAGE_NO      0x00
 #define PCF50633_ADCC1_AVERAGE_4       0x04
 #define PCF50633_ADCC1_AVERAGE_8       0x08