public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 2/7] regulator: s5m8767: Modify header file and Kconfig
@ 2012-06-18 11:28 Sangbeom Kim
  2012-06-18 12:12 ` Mark Brown
  0 siblings, 1 reply; 2+ messages in thread
From: Sangbeom Kim @ 2012-06-18 11:28 UTC (permalink / raw)
  To: 'Mark Brown', sameo
  Cc: 'Liam Girdwood', linux-kernel, sbkim01

As name of samsung pmic mfd driver is changed,
Modify s5m8767 regulator header and Kconfig.

Signed-off-by: Sangbeom Kim <sbkim73@samsung.com>
---
 drivers/regulator/Kconfig   |    2 +-
 drivers/regulator/s5m8767.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 00ffe05..196aaae 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -243,7 +243,7 @@ config REGULATOR_RC5T583
 
 config REGULATOR_S5M8767
 	tristate "Samsung S5M8767A voltage regulator"
-	depends on MFD_S5M_CORE
+	depends on MFD_SEC_CORE
 	help
 	 This driver supports a Samsung S5M8767A voltage output regulator
 	 via I2C bus. S5M8767A have 9 Bucks and 28 LDOs output and
diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c
index 22642c3..bd9cca8 100644
--- a/drivers/regulator/s5m8767.c
+++ b/drivers/regulator/s5m8767.c
@@ -19,8 +19,8 @@
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
-#include <linux/mfd/s5m87xx/s5m-core.h>
-#include <linux/mfd/s5m87xx/s5m-pmic.h>
+#include <linux/mfd/samsung/s5m-core.h>
+#include <linux/mfd/samsung/s5m-pmic.h>
 
 struct s5m8767_info {
 	struct device *dev;
-- 
1.7.1



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH 2/7] regulator: s5m8767: Modify header file and Kconfig
  2012-06-18 11:28 [PATCH 2/7] regulator: s5m8767: Modify header file and Kconfig Sangbeom Kim
@ 2012-06-18 12:12 ` Mark Brown
  0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2012-06-18 12:12 UTC (permalink / raw)
  To: Sangbeom Kim; +Cc: sameo, 'Liam Girdwood', linux-kernel, sbkim01

[-- Attachment #1: Type: text/plain, Size: 233 bytes --]

On Mon, Jun 18, 2012 at 08:28:51PM +0900, Sangbeom Kim wrote:
> As name of samsung pmic mfd driver is changed,
> Modify s5m8767 regulator header and Kconfig.

This needs to be squashed into the previous rename to avoid build
breaks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-06-18 12:12 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-18 11:28 [PATCH 2/7] regulator: s5m8767: Modify header file and Kconfig Sangbeom Kim
2012-06-18 12:12 ` Mark Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox