diff --git a/baseconfig/CONFIG_MMC_BLOCK_BOUNCE b/baseconfig/CONFIG_MMC_BLOCK_BOUNCE
deleted file mode 100644
index 4470e8359..000000000
--- a/baseconfig/CONFIG_MMC_BLOCK_BOUNCE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MMC_BLOCK_BOUNCE=y
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 8f666e877..2a9a75a85 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -3118,7 +3118,6 @@ CONFIG_MMA7660=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_CAVIUM_THUNDERX=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 2576f26e5..7cc63e99c 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -3098,7 +3098,6 @@ CONFIG_MMA7660=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_CAVIUM_THUNDERX=m
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
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index ae29ac079..feb02ba3b 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -3172,7 +3172,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
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 640fea8bf..06bb6e6b1 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -3152,7 +3152,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
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 500782bb0..0554bb20e 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -3302,7 +3302,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
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index f7b7bdf4a..ea6108c66 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -3005,7 +3005,6 @@ CONFIG_MMA7660=m
 # CONFIG_MMA9551 is not set
 # CONFIG_MMA9553 is not set
 # CONFIG_MMC35240 is not set
-CONFIG_MMC_BLOCK_BOUNCE=y
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_CB710=m
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index a1bf46a3b..c3dd1bfd3 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -3025,7 +3025,6 @@ CONFIG_MMA7660=m
 # CONFIG_MMA9551 is not set
 # CONFIG_MMA9553 is not set
 # CONFIG_MMC35240 is not set
-CONFIG_MMC_BLOCK_BOUNCE=y
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_CB710=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 80614d0e4..6df9e7c00 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -3025,7 +3025,6 @@ CONFIG_MMA7660=m
 # CONFIG_MMA9551 is not set
 # CONFIG_MMA9553 is not set
 # CONFIG_MMC35240 is not set
-CONFIG_MMC_BLOCK_BOUNCE=y
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_CB710=m
diff --git a/kernel-i686.config b/kernel-i686.config
index b93db5e74..0ac39cc94 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -3005,7 +3005,6 @@ CONFIG_MMA7660=m
 # CONFIG_MMA9551 is not set
 # CONFIG_MMA9553 is not set
 # CONFIG_MMC35240 is not set
-CONFIG_MMC_BLOCK_BOUNCE=y
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_CB710=m
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index d7a66a619..f449437b9 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -2864,7 +2864,6 @@ CONFIG_MMA7660=m
 # CONFIG_MMA9551 is not set
 # CONFIG_MMA9553 is not set
 # CONFIG_MMC35240 is not set
-CONFIG_MMC_BLOCK_BOUNCE=y
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_CB710=m
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 3ed5b3b88..5e43c5a96 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -2843,7 +2843,6 @@ CONFIG_MMA7660=m
 # CONFIG_MMA9551 is not set
 # CONFIG_MMA9553 is not set
 # CONFIG_MMC35240 is not set
-CONFIG_MMC_BLOCK_BOUNCE=y
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_CB710=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 192b520a0..554fd5f1c 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -2809,7 +2809,6 @@ CONFIG_MMA7660=m
 # CONFIG_MMA9551 is not set
 # CONFIG_MMA9553 is not set
 # CONFIG_MMC35240 is not set
-CONFIG_MMC_BLOCK_BOUNCE=y
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_CB710=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 3acc8f7b5..1487e5f3b 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -2788,7 +2788,6 @@ CONFIG_MMA7660=m
 # CONFIG_MMA9551 is not set
 # CONFIG_MMA9553 is not set
 # CONFIG_MMC35240 is not set
-CONFIG_MMC_BLOCK_BOUNCE=y
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_CB710=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index d706ed853..5cbe42ad1 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -2750,7 +2750,6 @@ CONFIG_MMA7660=m
 # CONFIG_MMA9551 is not set
 # CONFIG_MMA9553 is not set
 # CONFIG_MMC35240 is not set
-CONFIG_MMC_BLOCK_BOUNCE=y
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_CB710=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 68e167dba..c6c32dc36 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -2729,7 +2729,6 @@ CONFIG_MMA7660=m
 # CONFIG_MMA9551 is not set
 # CONFIG_MMA9553 is not set
 # CONFIG_MMC35240 is not set
-CONFIG_MMC_BLOCK_BOUNCE=y
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_CB710=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 34dd6902c..16540ab31 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -3076,7 +3076,6 @@ CONFIG_MMA7660=m
 # CONFIG_MMA9551 is not set
 # CONFIG_MMA9553 is not set
 # CONFIG_MMC35240 is not set
-CONFIG_MMC_BLOCK_BOUNCE=y
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_CB710=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 19f2ea591..819e0248d 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -3056,7 +3056,6 @@ CONFIG_MMA7660=m
 # CONFIG_MMA9551 is not set
 # CONFIG_MMA9553 is not set
 # CONFIG_MMC35240 is not set
-CONFIG_MMC_BLOCK_BOUNCE=y
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_CB710=m