]> CyberLeo.Net >> Repos - FreeBSD/stable/10.git/commit
projects / FreeBSD / stable / 10.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2456cac) | patch
Apply the other half of merges to sdhci_imx(4) and sdhci_fsl(4) that
authormarius <marius@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Wed, 2 Aug 2017 20:27:30 +0000 (20:27 +0000)
committermarius <marius@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Wed, 2 Aug 2017 20:27:30 +0000 (20:27 +0000)
commit1f6c9f8f3158be7f1a9014e1c6ac5e8b9b579b81
tree4a22966da40c2aca482ae38ec13ab9907ac331aftree | snapshot
parent2456cac1c5a05bda55e5cd304657f06e11c08bd7commit | diff
Apply the other half of merges to sdhci_imx(4) and sdhci_fsl(4) that
somehow stayed local when committing r318198, probably due to the
associated tree conflicts.

While at it, register the dependency of sdhci_fsl(4) on sdhci(4) and
allow the former to be built.

git-svn-id: svn://svn.freebsd.org/base/stable/10@321946 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
sys/arm/freescale/imx/imx_sdhci.c diff | blob | history
sys/conf/files.powerpc diff | blob | history
sys/powerpc/mpc85xx/fsl_sdhc.c diff | blob | history
sys/powerpc/mpc85xx/fsl_sdhc.h diff | blob | history
10-STABLE