summaryrefslogtreecommitdiffstats
path: root/kernel-armv7hl-debug.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2017-10-13 07:28:20 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2017-10-13 07:28:20 +0200
commitad05f3346d1de5932be9580d8271fc92c5d1766a (patch)
tree47aeb5ff90613b58baeeb3951728c17416bb36a1 /kernel-armv7hl-debug.config
parenta61cb6893506b1eac135da923ed2db58c5338986 (diff)
parent8e041bd19fd7f9c116e7c7961ccc0d09fdd1ca5f (diff)
downloadkernel-ad05f3346d1de5932be9580d8271fc92c5d1766a.tar.gz
kernel-ad05f3346d1de5932be9580d8271fc92c5d1766a.tar.xz
kernel-ad05f3346d1de5932be9580d8271fc92c5d1766a.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.14.0-0.rc4.git3.1.vanilla.knurd.1.fc27kernel-4.14.0-0.rc4.git3.1.vanilla.knurd.1.fc26
Diffstat (limited to 'kernel-armv7hl-debug.config')
-rw-r--r--kernel-armv7hl-debug.config1
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 1d59ea566..2539e2423 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -3322,7 +3322,6 @@ CONFIG_MMA8452=m
# CONFIG_MMC35240 is not set
CONFIG_MMC_ARMMMCI=m
CONFIG_MMC_BCM2835=m
-CONFIG_MMC_BLOCK_BOUNCE=y
CONFIG_MMC_BLOCK=m
CONFIG_MMC_BLOCK_MINORS=8
CONFIG_MMC_CB710=m