diff options
| author | Arnd Bergmann | 2014-03-17 11:14:34 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2014-03-17 11:14:34 +0100 |
| commit | cda88c8be59128da05d7cd58f9ce2754a1416516 (patch) | |
| tree | b0af393c68b3d53fcdb100b8cb07af884bd3d4d5 /sound | |
| parent | Merge tag 'socfpga_updates_for_3.15_v2' of git://git.rocketboards.org/linux-s... (diff) | |
| parent | Power: Reset: Generalize qnap-poweroff to work on Synology devices. (diff) | |
| download | kernel-qcow2-linux-cda88c8be59128da05d7cd58f9ce2754a1416516.tar.gz kernel-qcow2-linux-cda88c8be59128da05d7cd58f9ce2754a1416516.tar.xz kernel-qcow2-linux-cda88c8be59128da05d7cd58f9ce2754a1416516.zip | |
Merge tag 'mvebu-drivers-3.15-2' of git://git.infradead.org/linux-mvebu into next/drivers
Merge "mvebu drivers for v3.15" from Jason Cooper:
pull request #1:
- mvebu mbus
- use of_find_matching_node_and_match
- rtc
- use PTR_ERR_OR_ZERO in isl12057
- work around issue in mv where date returned is 2038
- kirkwood -> mach-mvebu
- various Kconfig oneliners to allow building kirkwood in -mvebu/
pull request #2:
- reset
- re-use qnap-poweroff driver for Synology NASs
* tag 'mvebu-drivers-3.15-2' of git://git.infradead.org/linux-mvebu:
Power: Reset: Generalize qnap-poweroff to work on Synology devices.
drivers: Enable building of Kirkwood drivers for mach-mvebu
rtc: mv: reset date if after year 2038
rtc: isl12057: use PTR_ERR_OR_ZERO to fix coccinelle warnings
bus: mvebu-mbus: make use of of_find_matching_node_and_match
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/kirkwood/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/kirkwood/Kconfig b/sound/soc/kirkwood/Kconfig index 78ed4a42ad21..106e2e22fed2 100644 --- a/sound/soc/kirkwood/Kconfig +++ b/sound/soc/kirkwood/Kconfig @@ -1,6 +1,6 @@ config SND_KIRKWOOD_SOC tristate "SoC Audio for the Marvell Kirkwood and Dove chips" - depends on ARCH_KIRKWOOD || ARCH_DOVE || COMPILE_TEST + depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD || COMPILE_TEST help Say Y or M if you want to add support for codecs attached to the Kirkwood I2S interface. You will also need to select the |