---

yaml --- r: 304094 b: refs/heads/master c: 6a7e261 h: refs/heads/master v: v3
git-mirror · May 9, 2012 · 92ce532 · 92ce532
1 parent ee1302e
commit 92ce532
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 528 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b76668ba8a7722f589af2e13a340f3629430a35a
+refs/heads/master: 6a7e2618b3dbfbf1e8ab2b4be102b2944738fb68
diff --git a/trunk/drivers/misc/Kconfig b/trunk/drivers/misc/Kconfig
@@ -490,14 +490,6 @@ config USB_SWITCH_FSA9480
 	  stereo and mono audio, video, microphone and UART data to use
 	  a common connector port.
 
-config MAX8997_MUIC
-	tristate "MAX8997 MUIC 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.
-
 source "drivers/misc/c2port/Kconfig"
 source "drivers/misc/eeprom/Kconfig"
 source "drivers/misc/cb710/Kconfig"

diff --git a/trunk/drivers/misc/Makefile b/trunk/drivers/misc/Makefile
@@ -48,4 +48,3 @@ obj-y				+= lis3lv02d/
 obj-y				+= carma/
 obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o
 obj-$(CONFIG_ALTERA_STAPL)	+=altera-stapl/
-obj-$(CONFIG_MAX8997_MUIC)	+= max8997-muic.o