diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mfd/Kconfig | 1 | ||||
-rw-r--r-- | drivers/mfd/sec-core.c | 10 |
2 files changed, 0 insertions, 11 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index bd4a155a9564..72d38081f779 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig | |||
@@ -672,7 +672,6 @@ config MFD_SEC_CORE | |||
672 | select MFD_CORE | 672 | select MFD_CORE |
673 | select REGMAP_I2C | 673 | select REGMAP_I2C |
674 | select REGMAP_IRQ | 674 | select REGMAP_IRQ |
675 | select REGULATOR | ||
676 | help | 675 | help |
677 | Support for the Samsung Electronics MFD series. | 676 | Support for the Samsung Electronics MFD series. |
678 | This driver provides common support for accessing the device, | 677 | This driver provides common support for accessing the device, |
diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c index b39960532f76..0a7bc43db4e4 100644 --- a/drivers/mfd/sec-core.c +++ b/drivers/mfd/sec-core.c | |||
@@ -32,7 +32,6 @@ | |||
32 | #include <linux/mfd/samsung/s2mpu02.h> | 32 | #include <linux/mfd/samsung/s2mpu02.h> |
33 | #include <linux/mfd/samsung/s5m8763.h> | 33 | #include <linux/mfd/samsung/s5m8763.h> |
34 | #include <linux/mfd/samsung/s5m8767.h> | 34 | #include <linux/mfd/samsung/s5m8767.h> |
35 | #include <linux/regulator/machine.h> | ||
36 | #include <linux/regmap.h> | 35 | #include <linux/regmap.h> |
37 | 36 | ||
38 | static const struct mfd_cell s5m8751_devs[] = { | 37 | static const struct mfd_cell s5m8751_devs[] = { |
@@ -461,15 +460,6 @@ static int sec_pmic_suspend(struct device *dev) | |||
461 | */ | 460 | */ |
462 | disable_irq(sec_pmic->irq); | 461 | disable_irq(sec_pmic->irq); |
463 | 462 | ||
464 | switch (sec_pmic->device_type) { | ||
465 | case S2MPS14X: | ||
466 | case S2MPU02: | ||
467 | regulator_suspend_prepare(PM_SUSPEND_MEM); | ||
468 | break; | ||
469 | default: | ||
470 | break; | ||
471 | } | ||
472 | |||
473 | return 0; | 463 | return 0; |
474 | } | 464 | } |
475 | 465 | ||