Merge tag 'mfd-3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next

[linux.git] / include / linux / mfd / samsung / s2mps11.h

diff --git a/include/linux/mfd/samsung/s2mps11.h b/include/linux/mfd/samsung/s2mps11.h
index d0d52ea6007439c18c3cf17bb71961187da72026..b3ddf98dec3734ea7c4fc483a2efacc8cd7dfcad 100644 (file)
--- a/include/linux/mfd/samsung/s2mps11.h
+++ b/include/linux/mfd/samsung/s2mps11.h
@@ -167,11 +167,8 @@ enum s2mps11_regulators {
        S2MPS11_BUCK8,
        S2MPS11_BUCK9,
        S2MPS11_BUCK10,
-       S2MPS11_AP_EN32KHZ,
-       S2MPS11_CP_EN32KHZ,
-       S2MPS11_BT_EN32KHZ,
 
-       S2MPS11_REG_MAX,
+       S2MPS11_REGULATOR_MAX,
 };
 
 #define S2MPS11_BUCK_MIN1      600000
@@ -203,6 +200,5 @@ enum s2mps11_regulators {
 #define S2MPS11_BUCK4_RAMP_EN_SHIFT    1
 #define S2MPS11_BUCK6_RAMP_EN_SHIFT    0
 #define S2MPS11_PMIC_EN_SHIFT  6
-#define S2MPS11_REGULATOR_MAX (S2MPS11_REG_MAX - 3)
 
 #endif /*  __LINUX_MFD_S2MPS11_H */