diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-10-06 08:01:11 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-10-06 08:01:11 -0400 |
| commit | 8df22a4d6f5b81c9c1703579d4907b57002689ed (patch) | |
| tree | 064e9662d427a82076e1151fcd9aa78a1066f9f4 /arch/s390/configs/default_defconfig | |
| parent | 0cae90a96c15f2fd3bd139ba5505755c9c9ef2eb (diff) | |
| parent | a5448c88b812390a3622e76d774e10c0da1fb970 (diff) | |
Merge tag 'asoc-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.18
- More componentisation work from Lars-Peter, this time mainly
cleaning up the suspend and bias level transition callbacks.
- Real system support for the Intel drivers and a bunch of fixes and
enhancements for the associated CODEC drivers, this is going to need
a lot quirks over time due to the lack of any firmware description of
the boards.
- Jack detect support for simple card from Dylan Reid.
- A bunch of small fixes and enhancements for the Freescale drivers.
- New drivers for Analog Devices SSM4567, Cirrus Logic CS35L32, Everest
Semiconductor ES8328 and Freescale cards using the ASRC in newer i.MX
processors.
Diffstat (limited to 'arch/s390/configs/default_defconfig')
| -rw-r--r-- | arch/s390/configs/default_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/configs/default_defconfig b/arch/s390/configs/default_defconfig index 3ca1894ade09..9d94fdd9f525 100644 --- a/arch/s390/configs/default_defconfig +++ b/arch/s390/configs/default_defconfig | |||
| @@ -63,6 +63,7 @@ CONFIG_CRASH_DUMP=y | |||
| 63 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 63 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
| 64 | CONFIG_BINFMT_MISC=m | 64 | CONFIG_BINFMT_MISC=m |
| 65 | CONFIG_HIBERNATION=y | 65 | CONFIG_HIBERNATION=y |
| 66 | CONFIG_NET=y | ||
| 66 | CONFIG_PACKET=y | 67 | CONFIG_PACKET=y |
| 67 | CONFIG_PACKET_DIAG=m | 68 | CONFIG_PACKET_DIAG=m |
| 68 | CONFIG_UNIX=y | 69 | CONFIG_UNIX=y |