Fix merge conflicts

Origin commit data
------------------
Commit: 8272eda529
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)
This commit is contained in:
Michael Liebmann
2016-08-19 17:58:43 +02:00
parent 1f6f0e5604
commit 6192e893ab
5 changed files with 12 additions and 4 deletions

View File

@@ -46,6 +46,7 @@
#include <linux/hdreg.h>
#include <linux/fs.h>
#include "debug.h"
#include <driver/fontrenderer.h>
#include <global.h>
#include <system/helpers.h>
#include <gui/update_ext.h>