summaryrefslogtreecommitdiffstats
path: root/drivers/extcon/Kconfig
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-16 18:19:55 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-16 18:19:55 -0700
commit28a78e46f04ac5c4952533f2938a18699f207004 (patch)
tree2991c5cea8d7f912abbe59e315fd1ed03febe45c /drivers/extcon/Kconfig
parent84a1caf1453c3d44050bd22db958af4a7f99315c (diff)
parentb0d1f807f340e91b27aa721f6474956af11571da (diff)
downloadlinux-28a78e46f04ac5c4952533f2938a18699f207004.tar.bz2
Merge 3.5-rc7 into driver-core-next
This pulls in the printk fixes to the driver-core-next branch. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/extcon/Kconfig')
-rw-r--r--drivers/extcon/Kconfig8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/extcon/Kconfig b/drivers/extcon/Kconfig
index 29c5cf852efc..bb385ac629a8 100644
--- a/drivers/extcon/Kconfig
+++ b/drivers/extcon/Kconfig
@@ -29,4 +29,12 @@ config EXTCON_MAX8997
Maxim MAX8997 PMIC. The MAX8997 MUIC is a USB port accessory
detector and switch.
+config EXTCON_ARIZONA
+ tristate "Wolfson Arizona EXTCON support"
+ depends on MFD_ARIZONA
+ help
+ Say Y here to enable support for external accessory detection
+ with Wolfson Arizona devices. These are audio CODECs with
+ advanced audio accessory detection support.
+
endif # MULTISTATE_SWITCH