diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-10-22 13:20:27 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-10-22 13:20:27 +0300 |
| commit | be590cb8631d480e904ca9685e616c8fd6c1d573 (patch) | |
| tree | 767285551281f7a8b46f8fba4f5fbbf61888c3c1 /Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c | |
| parent | 7fc1b65544237cc84a6f92ccf00f51a4e77190a9 (diff) | |
| parent | 1c089e07b393722183acaee32b903df630b32862 (diff) | |
| download | Tango-be590cb8631d480e904ca9685e616c8fd6c1d573.tar.gz Tango-be590cb8631d480e904ca9685e616c8fd6c1d573.zip | |
merge conflicts
Diffstat (limited to 'Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c index b9c87cd66..56888b742 100644 --- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c +++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c @@ -31,7 +31,7 @@ #include <Communication/PMR/IO/GetFilesResponse.pb-c.h> #include <Communication/PMR/IO/FileAttribute.pb-c.h> -#include "drivers/Flash_Memory/Flash_Memory.h" + #include "drivers/Flash_Memory/fatfs/ff.h" #include "drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h" |