summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2016-04-10 12:35:21 +0100
committerPeter Robinson <pbrobinson@gmail.com>2016-04-10 12:35:21 +0100
commite9555570fea8faf3b3dced2ae0983682d975a12b (patch)
treefb04f73154d9ccd17dbe0041dde62c0fdd7e7dea
parentf7b266df32c97fc2e2132b4fb4b73819fd0f88f1 (diff)
downloadkernel-e9555570fea8faf3b3dced2ae0983682d975a12b.tar.gz
kernel-e9555570fea8faf3b3dced2ae0983682d975a12b.tar.xz
kernel-e9555570fea8faf3b3dced2ae0983682d975a12b.zip
Use the correct MMC driver for some ARM platforms
-rw-r--r--config-armv7-generic3
-rw-r--r--kernel.spec3
2 files changed, 5 insertions, 1 deletions
diff --git a/config-armv7-generic b/config-armv7-generic
index a51a85b40..c564a5bc4 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -241,7 +241,8 @@ CONFIG_NVMEM_SUNXI_SID=m
CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
CONFIG_DMA_BCM2835=m
-CONFIG_MMC_SDHCI_BCM2835=m
+CONFIG_MMC_SDHCI_IPROC=m
+# CONFIG_MMC_SDHCI_BCM2835 is not set
CONFIG_BCM2835_MBOX=m
CONFIG_PWM_BCM2835=m
CONFIG_HW_RANDOM_BCM2835=m
diff --git a/kernel.spec b/kernel.spec
index 95a7186cc..66038e7a7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2154,6 +2154,9 @@ fi
#
#
%changelog
+* Sun Apr 10 2016 Peter Robinson <pbrobinson@fedoraproject.org>
+- Use the correct MMC driver for some ARM platforms
+
* Fri Apr 08 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.6.0-0.rc2.git4.1
- Linux v4.6-rc2-151-g3c96888