diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-01-05 16:09:49 -0500 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-01-05 16:09:49 -0500 |
commit | 208228cebd8a9b5af5da4e12e3d90e4a03679cf0 (patch) | |
tree | 0cf4e87e7877bff42d1f3b480c2d585347ee3eba /config-armv7 | |
parent | bfe354a1c3609cdd83fd0647153365ff4f81701f (diff) | |
download | kernel-208228cebd8a9b5af5da4e12e3d90e4a03679cf0.tar.gz kernel-208228cebd8a9b5af5da4e12e3d90e4a03679cf0.tar.xz kernel-208228cebd8a9b5af5da4e12e3d90e4a03679cf0.zip |
Linux v3.19-rc2
- Temporarily disable aarch64patches
- Happy New Year
Diffstat (limited to 'config-armv7')
-rw-r--r-- | config-armv7 | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/config-armv7 b/config-armv7 index 652d2248f..223684aef 100644 --- a/config-armv7 +++ b/config-armv7 @@ -114,6 +114,7 @@ CONFIG_OMAP3_EMU=y CONFIG_SERIAL_OMAP=y CONFIG_SERIAL_OMAP_CONSOLE=y +CONFIG_SERIAL_8250_OMAP=m CONFIG_GPIO_TWL4030=m CONFIG_GPIO_TWL6040=m @@ -258,7 +259,7 @@ CONFIG_SND_OMAP_SOC_DMIC=m CONFIG_SND_OMAP_SOC_HDMI=m CONFIG_SND_OMAP_SOC_MCBSP=m CONFIG_SND_OMAP_SOC_MCPDM=m -CONFIG_SND_OMAP_SOC_OMAP_HDMI=m +CONFIG_SND_OMAP_SOC_HDMI_AUDIO=m CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m @@ -372,6 +373,7 @@ CONFIG_SOC_IMX53=y CONFIG_SOC_IMX6Q=y CONFIG_SOC_IMX6SL=y CONFIG_SOC_IMX6SX=y +# CONFIG_SOC_LS1021A is not set # CONFIG_SOC_VF610 is not set CONFIG_ARM_IMX6Q_CPUFREQ=m CONFIG_PCI_IMX6=y @@ -411,6 +413,8 @@ CONFIG_CRYPTO_DEV_SAHARA=m CONFIG_RTC_DRV_SNVS=m # CONFIG_FB_MX3 is not set # CONFIG_FB_IMX is not set +# CONFIG_FB_MXS is not set +# CONFIG_POWER_RESET_IMX is not set CONFIG_SND_IMX_SOC=m CONFIG_SND_SOC_FSL_ASOC_CARD=m @@ -501,6 +505,7 @@ CONFIG_REGULATOR_DA9055=m CONFIG_ARCH_EXYNOS4=y CONFIG_SOC_EXYNOS4212=y CONFIG_SOC_EXYNOS4412=y +# CONFIG_SOC_EXYNOS4415 is not set CONFIG_ARM_EXYNOS4210_CPUFREQ=y CONFIG_ARM_EXYNOS4X12_CPUFREQ=y CONFIG_AK8975=m @@ -521,6 +526,10 @@ CONFIG_COMMON_CLK_RK808=m CONFIG_REGULATOR_RK808=m CONFIG_RTC_DRV_HYM8563=m CONFIG_ROCKCHIP_SARADC=m +CONFIG_ROCKCHIP_IOMMU=y +CONFIG_SND_SOC_ROCKCHIP_I2S=m +CONFIG_ROCKCHIP_THERMAL=m +CONFIG_DRM_ROCKCHIP=m # ST Ericsson CONFIG_MACH_HREFV60=y |