commit 9950f68af6256d121d44370ac3b6bfd267a796e0
author Austin Schuh <austin.linux@gmail.com> Sat Nov 06 15:27:58 2021 -0700
committer Austin Schuh <austin.linux@gmail.com> Sat Nov 06 15:27:58 2021 -0700
tree aff03c18c577ce51d0d92200a1b9279c9bfc7d46
parent dabc8ff9342f29147903347f4dde6e6a05a9543d
parent 812d0d18f8a83ab7e62014bfd52dd91a751f674d

Merge commit '4ee017201227ce16a4edef20912b357e8f303483' into master

Update WPILib for the 2022 beta test.  This now actually runs on my RIO
2.0!

Change-Id: I6d335f61c6abe50facca76f4f5014537e742f1ac
Signed-off-by: Austin Schuh <austin.linux@gmail.com>

frc971/wpilib/dma_edge_counting.h

diff --git a/frc971/wpilib/dma_edge_counting.h b/frc971/wpilib/dma_edge_counting.h
index b645d01..2d49ecb 100644
--- a/frc971/wpilib/dma_edge_counting.h
+++ b/frc971/wpilib/dma_edge_counting.h
@@ -8,12 +8,12 @@
 #include "aos/macros.h"
 
 #include "aos/containers/sized_array.h"
+#include "frc971/wpilib/ahal/Utility.h"
 #include "frc971/wpilib/dma.h"
 
 #include "frc971/wpilib/ahal/AnalogInput.h"
 #include "frc971/wpilib/ahal/DigitalInput.h"
 #include "frc971/wpilib/ahal/Encoder.h"
-#include "frc971/wpilib/ahal/Utility.h"
 #undef ERROR
 
 namespace frc971 {