---

yaml --- r: 220575 b: refs/heads/master c: f8539dd h: refs/heads/master i: 220573: 9af6e35 220571: 6402ab1 220567: 4d459fd 220559: ac11851 220543: 1cd9c7e v: v3
git-mirror · Oct 28, 2010 · 612d688 · 612d688
1 parent 7acc7cb
commit 612d688
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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);