Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d167e0d authored by Olof Johansson's avatar Olof Johansson
Browse files

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
parents 88b1988e c62ab985

arch/arm/configs/mxs_defconfig

+17 −3
Original line number Diff line number Diff line
@@ -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