From: chaoskagami <chaos.kagami@gmail.com>
Date: Thu, 14 Jul 2016 09:45:54 +0000 (-0400)
Subject: Merge branch 'master' into ctr9io
X-Git-Tag: v0.2.0~24^2
X-Git-Url: https://chaos.moe/g/?a=commitdiff_plain;h=b271bc09736b449553a8e809ecb81460a3027707;p=corbenik%2Fcorbenik.git

Merge branch 'master' into ctr9io
---

b271bc09736b449553a8e809ecb81460a3027707
diff --cc source/firm/firm.c
index 273eb42,f29cdb8..0faec0c
--- a/source/firm/firm.c
+++ b/source/firm/firm.c
@@@ -4,7 -4,7 +4,7 @@@
  #include <stddef.h>
  
  #include "../common.h"
- #include "../misc/sha256.h"
 -#include "../fatfs/sdmmc.h"
++#include <ctr9/io.h>
  
  firm_h *firm_loc = (firm_h *)FCRAM_FIRM_LOC;
  uint32_t firm_size = FCRAM_SPACING;