From 612d6883e3008ca39f3fe0e6f5963b36b7709345 Mon Sep 17 00:00:00 2001
From: Kyungmin Park <kyungmin.park@samsung.com>
Date: Mon, 23 Aug 2010 13:46:49 +0900
Subject: [PATCH] --- yaml --- r: 220575 b: refs/heads/master c:
 f8539ddcbbbca7b6a06e0c2cdfbd116ba43a2fe0 h: refs/heads/master i:   220573:
 9af6e35db2232e8ae0c489c88e4bc01f1c255afc   220571:
 6402ab1fe0b85e7482367cb3b82524162e6a413e   220567:
 4d459fdf2f7dfa5bcaefca521180f153cd8304ad   220559:
 ac11851ff52f2e5102a9565b66d4230d4ef7f954   220543:
 1cd9c7e6aea53b484e5b8412e84a21cc1b1f6e89 v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/mfd/Kconfig   | 11 ++++++-----
 trunk/drivers/mfd/max8998.c |  5 +++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 15e9b87c92fa..59077d87c4b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8e9cf0b28173fc25dae9f3ac44de6fc4e9fc385
+refs/heads/master: f8539ddcbbbca7b6a06e0c2cdfbd116ba43a2fe0
diff --git a/trunk/drivers/mfd/Kconfig b/trunk/drivers/mfd/Kconfig
index b3aedaaa7092..02cd6c0e59cb 100644
--- a/trunk/drivers/mfd/Kconfig
+++ b/trunk/drivers/mfd/Kconfig
@@ -294,14 +294,15 @@ config MFD_MAX8925
 	  to use the functionality of the device.
 
 config MFD_MAX8998
-	bool "Maxim Semiconductor MAX8998 PMIC Support"
+	bool "Maxim Semiconductor MAX8998/National LP3974 PMIC Support"
 	depends on I2C=y
 	select MFD_CORE
 	help
-	  Say yes here to support for Maxim Semiconductor MAX8998. This is
-	  a Power Management IC. This driver provies common support for
-	  accessing the device, additional drivers must be enabled in order
-	  to use the functionality of the device.
+	  Say yes here to support for Maxim Semiconductor MAX8998 and
+	  National Semiconductor LP3974. This is a Power Management IC.
+	  This driver provies common support for accessing the device,
+	  additional drivers must be enabled in order to use the functionality
+	  of the device.
 
 config MFD_WM8400
 	tristate "Support Wolfson Microelectronics WM8400"
diff --git a/trunk/drivers/mfd/max8998.c b/trunk/drivers/mfd/max8998.c
index 73e6f5c4efc9..f1c928915880 100644
--- a/trunk/drivers/mfd/max8998.c
+++ b/trunk/drivers/mfd/max8998.c
@@ -125,8 +125,9 @@ static int max8998_i2c_remove(struct i2c_client *i2c)
 }
 
 static const struct i2c_device_id max8998_i2c_id[] = {
-       { "max8998", 0 },
-       { }
+	{ "max8998", 0 },
+	{ "lp3974", 0 },
+	{ }
 };
 MODULE_DEVICE_TABLE(i2c, max8998_i2c_id);