diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2013-11-12 13:22:52 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2013-11-12 14:24:29 -0500 |
| commit | 713abc0c25d574380a3154b9c4d524ac2f5aab29 (patch) | |
| tree | 972ea7d7258b7c6b59f788a7d59a3ecdcde135c5 /config-armv7 | |
| parent | 6dfcb01411c8465cede72726b709b986754c3ed1 (diff) | |
| download | kernel-713abc0c25d574380a3154b9c4d524ac2f5aab29.tar.gz kernel-713abc0c25d574380a3154b9c4d524ac2f5aab29.tar.xz kernel-713abc0c25d574380a3154b9c4d524ac2f5aab29.zip | |
Linux v3.12-4849-g10d0c97
Replace x86-allow-1024-cpus.patch with the patch that contains the one hunk
not already applied upstream.
Don't install the 'trace' alias symlink for 'perf trace'. Seems much too
generic to just throw that into /usr/bin
Diffstat (limited to 'config-armv7')
| -rw-r--r-- | config-armv7 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config-armv7 b/config-armv7 index 0118a15a5..ec0233678 100644 --- a/config-armv7 +++ b/config-armv7 @@ -316,6 +316,7 @@ CONFIG_TI_CPTS=y CONFIG_TI_EMIF=m CONFIG_DRM_TILCDC=m CONFIG_SPI_DAVINCI=m +CONFIG_SND_DAVINCI_SOC=m CONFIG_REGULATOR_TI_ABB=y CONFIG_TI_PRIV_EDMA=y CONFIG_TI_EDMA=y @@ -325,6 +326,7 @@ CONFIG_CHARGER_BQ24190=m CONFIG_TI_ADC081C=m CONFIG_TI_AM335X_ADC=m CONFIG_PWM_TIPWMSS=y +CONFIG_SND_AM33XX_SOC_EVM=m # Allwinner a1x CONFIG_PINCTRL_SUNXI=y |