summaryrefslogtreecommitdiffstats
path: root/config-armv7-lpae
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2014-04-14 13:13:02 +0100
committerPeter Robinson <pbrobinson@gmail.com>2014-04-14 13:13:02 +0100
commit7b5be104e58ddf140574c831e1da780357b8acf2 (patch)
treed978f18c0b6d5439c98517d12e1d76f22716b34d /config-armv7-lpae
parent9883f903b2c773b1de94843adeb8691d56e0c4db (diff)
downloadkernel-7b5be104e58ddf140574c831e1da780357b8acf2.tar.gz
kernel-7b5be104e58ddf140574c831e1da780357b8acf2.tar.xz
kernel-7b5be104e58ddf140574c831e1da780357b8acf2.zip
Minor ARM config changes and cleanups for 3.15 merge window
Diffstat (limited to 'config-armv7-lpae')
-rw-r--r--config-armv7-lpae1
1 files changed, 1 insertions, 0 deletions
diff --git a/config-armv7-lpae b/config-armv7-lpae
index 7c362a1e9..bc9324fde 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -113,6 +113,7 @@ CONFIG_KEYSTONE_USB_PHY=m
CONFIG_USB_DWC3_KEYSTONE=m
CONFIG_GPIO_DAVINCI=y
CONFIG_I2C_DAVINCI=m
+CONFIG_TI_AEMIF=m
# CONFIG_DAVINCI_WATCHDOG is not set
# CONFIG_SPI_DAVINCI is not set
# CONFIG_SND_DAVINCI_SOC is not set