summaryrefslogtreecommitdiffstats
path: root/config-armv7
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2014-07-11 00:10:56 +0100
committerPeter Robinson <pbrobinson@gmail.com>2014-07-11 00:10:56 +0100
commit889d497170e0f8640f42d40245cb1f8fd460b4f6 (patch)
tree0e337a38746d080e8b0b1a63e77689fb97b612f4 /config-armv7
parent005b64429717cfef012e5567f348efc230c959ed (diff)
downloadkernel-889d497170e0f8640f42d40245cb1f8fd460b4f6.tar.gz
kernel-889d497170e0f8640f42d40245cb1f8fd460b4f6.tar.xz
kernel-889d497170e0f8640f42d40245cb1f8fd460b4f6.zip
Rebase Utilute and BeagleBone patches, Minaor ARM updates
Diffstat (limited to 'config-armv7')
-rw-r--r--config-armv74
1 files changed, 4 insertions, 0 deletions
diff --git a/config-armv7 b/config-armv7
index e032333b2..e28a01642 100644
--- a/config-armv7
+++ b/config-armv7
@@ -171,6 +171,7 @@ CONFIG_REGULATOR_PALMAS=y
CONFIG_REGULATOR_PBIAS=m
CONFIG_RTC_DRV_PALMAS=m
CONFIG_OMAP5_DSS_HDMI=y
+CONFIG_OMAP5_DSS_HDMI_AUDIO=y
CONFIG_WL_TI=y
CONFIG_WLCORE_SDIO=m
@@ -656,6 +657,9 @@ CONFIG_XILINX_VDMA=m
CONFIG_SND_SOC_ADI=m
CONFIG_SND_SOC_ADI_AXI_I2S=m
CONFIG_SND_SOC_ADI_AXI_SPDIF=m
+CONFIG_XILLYBUS=m
+CONFIG_XILLYBUS_PCIE=m
+CONFIG_XILLYBUS_OF=m
# Multi function devices
CONFIG_MFD_88PM800=m