diff options
| author | Olof Johansson <olof@lixom.net> | 2012-02-07 23:14:06 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-02-07 23:14:06 (GMT) |
| commit | 0d167e0dd3e28ee5502a0e9f8d10c9730d35c5b7 (patch) | |
| tree | 237d29da78122379c861227f37cc833f966f9898 /arch | |
| parent | 88b1988ec2337f5fd8b9204a919838d0bc34b7b4 (diff) | |
| parent | c62ab98584396480467a6e422ab172644862de35 (diff) | |
| download | linux-0d167e0dd3e28ee5502a0e9f8d10c9730d35c5b7.tar.xz | |
Merge branch 'mxs/defconfig' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc
* 'mxs/defconfig' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: mx28: Let audio support be built by default
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/mxs_defconfig | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig index 6ee781b..1ebbf45 100644 --- a/arch/arm/configs/mxs_defconfig +++ b/arch/arm/configs/mxs_defconfig @@ -77,10 +77,10 @@ CONFIG_DEVPTS_MULTIPLE_INSTANCES=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y # CONFIG_HW_RANDOM is not set -CONFIG_I2C=m +CONFIG_I2C=y # CONFIG_I2C_COMPAT is not set -CONFIG_I2C_CHARDEV=m -CONFIG_I2C_MXS=m +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_MXS=y CONFIG_SPI=y CONFIG_SPI_GPIO=m CONFIG_DEBUG_GPIO=y @@ -90,6 +90,20 @@ CONFIG_GPIO_SYSFS=y CONFIG_DISPLAY_SUPPORT=m # CONFIG_HID_SUPPORT is not set # CONFIG_USB_SUPPORT is not set +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_JACK=y +CONFIG_SND_DRIVERS=y +CONFIG_SND_ARM=y +CONFIG_SND_SOC=y +CONFIG_SND_MXS_SOC=y +CONFIG_SND_SOC_MXS_SGTL5000=y +CONFIG_SND_SOC_I2C_AND_SPI=y +CONFIG_SND_SOC_SGTL5000=y +CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_MMC=y CONFIG_MMC_MXS=y CONFIG_RTC_CLASS=y |