aboutsummaryrefslogtreecommitdiffstats
path: root/main/linux-rpi/config-rpi2.armhf
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2015-06-23 09:46:36 +0300
committerTimo Teräs <timo.teras@iki.fi>2015-06-23 06:58:13 +0000
commitc279138c9b0c6a2142c76a02d6757bd8a95f43a2 (patch)
treec11a75f7d68db35a91c0821046cd3c4bc81ac1d6 /main/linux-rpi/config-rpi2.armhf
parent6aaecf49dfa1786cf5939d337593cce8fc1ded80 (diff)
downloadaports-c279138c9b0c6a2142c76a02d6757bd8a95f43a2.tar.bz2
aports-c279138c9b0c6a2142c76a02d6757bd8a95f43a2.tar.xz
main/linux-rpi: upgrade to 3.18.16
Diffstat (limited to 'main/linux-rpi/config-rpi2.armhf')
-rw-r--r--main/linux-rpi/config-rpi2.armhf11
1 files changed, 6 insertions, 5 deletions
diff --git a/main/linux-rpi/config-rpi2.armhf b/main/linux-rpi/config-rpi2.armhf
index 81c7085576..1d436a9d69 100644
--- a/main/linux-rpi/config-rpi2.armhf
+++ b/main/linux-rpi/config-rpi2.armhf
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.18.11 Kernel Configuration
+# Linux/arm 3.18.16 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -3298,15 +3298,16 @@ CONFIG_MMC_BLOCK_BOUNCE=y
#
# MMC/SD/SDIO Host Controller Drivers
#
+CONFIG_MMC_BCM2835=y
+CONFIG_MMC_BCM2835_DMA=y
+CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2
+CONFIG_MMC_BCM2835_SDHOST=y
# CONFIG_MMC_ARMMMCI is not set
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_PLTFM=y
# CONFIG_MMC_SDHCI_OF_ARASAN is not set
# CONFIG_MMC_SDHCI_PXAV3 is not set
# CONFIG_MMC_SDHCI_PXAV2 is not set
-CONFIG_MMC_BCM2835=y
-CONFIG_MMC_BCM2835_DMA=y
-CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2
CONFIG_MMC_SPI=m
# CONFIG_MMC_DW is not set
# CONFIG_MMC_VUB300 is not set
@@ -3467,7 +3468,7 @@ CONFIG_DMA_BCM2708=y
# CONFIG_FSL_EDMA is not set
# CONFIG_NBPFAXI_DMA is not set
CONFIG_DMA_ENGINE=y
-CONFIG_DMA_VIRTUAL_CHANNELS=m
+CONFIG_DMA_VIRTUAL_CHANNELS=y
CONFIG_DMA_OF=y
#