diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-11 16:44:43 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-11 16:44:43 -0500 |
| commit | 105cf1fe1d4a282bec1849dbbf608157c5e04f07 (patch) | |
| tree | 1d1c83402d2790054f687dd4605973c29662f0d9 /drivers/extcon/Kconfig | |
| parent | 1c7db96f6feac95d90200ddd0f9b5d94614ea759 (diff) | |
| parent | bf14ee5a460276a99ed35f9034bae9e74b01600f (diff) | |
Merge tag 'extcon-arizona-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc into char-misc-next
Mark writes:
extcon: arizona: Updates for v3.9
More updates for v3.9, a mix of fixes for the code that's already there
and a few new features.
Diffstat (limited to 'drivers/extcon/Kconfig')
| -rw-r--r-- | drivers/extcon/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/extcon/Kconfig b/drivers/extcon/Kconfig index 10df3fa3db67..5168a1324a65 100644 --- a/drivers/extcon/Kconfig +++ b/drivers/extcon/Kconfig | |||
| @@ -47,7 +47,7 @@ config EXTCON_MAX8997 | |||
| 47 | 47 | ||
| 48 | config EXTCON_ARIZONA | 48 | config EXTCON_ARIZONA |
| 49 | tristate "Wolfson Arizona EXTCON support" | 49 | tristate "Wolfson Arizona EXTCON support" |
| 50 | depends on MFD_ARIZONA && INPUT | 50 | depends on MFD_ARIZONA && INPUT && SND_SOC |
| 51 | help | 51 | help |
| 52 | Say Y here to enable support for external accessory detection | 52 | Say Y here to enable support for external accessory detection |
| 53 | with Wolfson Arizona devices. These are audio CODECs with | 53 | with Wolfson Arizona devices. These are audio CODECs with |