---

yaml --- r: 324362 b: refs/heads/master c: 3afebf5 h: refs/heads/master v: v3
git-mirror · Aug 16, 2012 · c5a1396 · c5a1396
1 parent 7618724
commit c5a1396
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 276 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 980d7929816236476967218645c30acc022042eb
+refs/heads/master: 3afebf577d4cb21215abb388e80c46c9c387ed0f
diff --git a/trunk/drivers/extcon/Kconfig b/trunk/drivers/extcon/Kconfig
@@ -21,12 +21,6 @@ config EXTCON_GPIO
 	  Say Y here to enable GPIO based extcon support. Note that GPIO
 	  extcon supports single state per extcon instance.
 
-config EXTCON_ADC_JACK
-	tristate "ADC Jack extcon support"
-	depends on IIO
-	help
-	  Say Y here to enable extcon device driver based on ADC values.
-
 config EXTCON_MAX77693
 	tristate "MAX77693 EXTCON Support"
 	depends on MFD_MAX77693

diff --git a/trunk/drivers/extcon/Makefile b/trunk/drivers/extcon/Makefile
@@ -4,7 +4,6 @@
 
 obj-$(CONFIG_EXTCON)		+= extcon_class.o
 obj-$(CONFIG_EXTCON_GPIO)	+= extcon_gpio.o
-obj-$(CONFIG_EXTCON_ADC_JACK)	+= extcon-adc-jack.o
 obj-$(CONFIG_EXTCON_MAX77693)	+= extcon-max77693.o
 obj-$(CONFIG_EXTCON_MAX8997)	+= extcon-max8997.o
 obj-$(CONFIG_EXTCON_ARIZONA)	+= extcon-arizona.o
diff --git a/trunk/drivers/extcon/extcon-adc-jack.c b/trunk/drivers/extcon/extcon-adc-jack.c
diff --git a/trunk/include/linux/extcon/extcon-adc-jack.h b/trunk/include/linux/extcon/extcon-adc-jack.h