The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=efc3ebeb69383a9b54f2670d8f705fd2410904b4
commit efc3ebeb69383a9b54f2670d8f705fd2410904b4 Author: Warner Losh <[email protected]> AuthorDate: 2021-08-04 02:09:18 +0000 Commit: Warner Losh <[email protected]> CommitDate: 2021-08-04 02:12:22 +0000 Revert "arm: remove fslsdma from GENERIC" The firmware was already in the tree when I did this commit, and I missed the message. The bug was obsolete. This reverts commit 9e3761d126c5c019d6c935e83989928eb1a0e76e. The commit was f219c053852d82acb9852cd735c815ba315f416d in stable/13. PR: 237466 Sponsored by: Netflix (cherry picked from commit e94f1a0a37fdd3252201aaa5a94f46da7f8e740e) --- sys/arm/conf/GENERIC | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC index bc191d86dd59..165f707106f4 100644 --- a/sys/arm/conf/GENERIC +++ b/sys/arm/conf/GENERIC @@ -258,6 +258,7 @@ device ti_pruss device ti_mbox # DMA controller +device fslsdma device ti_sdma device a10_dmac device a31_dmac _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all To unsubscribe, send any mail to "[email protected]"
