---

yaml --- r: 304093 b: refs/heads/master c: b76668b h: refs/heads/master i: 304091: 3086af3 v: v3
git-mirror · May 9, 2012 · ee1302e · ee1302e
1 parent e36a6ae
commit ee1302e
Show file tree

Hide file tree

Showing 4 changed files with 547 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b552b92817c63fdccfe9d5f3ce7424b57e9ee8f
+refs/heads/master: b76668ba8a7722f589af2e13a340f3629430a35a
diff --git a/trunk/drivers/extcon/Kconfig b/trunk/drivers/extcon/Kconfig
@@ -21,4 +21,12 @@ config EXTCON_GPIO
 	  Say Y here to enable GPIO based extcon support. Note that GPIO
 	  extcon supports single state per extcon instance.
 
+config EXTCON_MAX8997
+	tristate "MAX8997 EXTCON Support"
+	depends on MFD_MAX8997
+	help
+	  If you say yes here you get support for the MUIC device of
+	  Maxim MAX8997 PMIC. The MAX8997 MUIC is a USB port accessory
+	  detector and switch.
+
 endif # MULTISTATE_SWITCH
diff --git a/trunk/drivers/extcon/Makefile b/trunk/drivers/extcon/Makefile
@@ -4,3 +4,4 @@
 
 obj-$(CONFIG_EXTCON)		+= extcon_class.o
 obj-$(CONFIG_EXTCON_GPIO)	+= extcon_gpio.o
+obj-$(CONFIG_EXTCON_MAX8997)	+= extcon-max8997.o
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,3 +4,4 @@

		obj-$(CONFIG_EXTCON) += extcon_class.o
		obj-$(CONFIG_EXTCON_GPIO) += extcon_gpio.o
		obj-$(CONFIG_EXTCON_MAX8997) += extcon-max8997.o