mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-09 22:58:28 +02:00
mipsel: fix merge
Origin commit data
------------------
Commit: c28cac49bb
Author: max_10 <max_10@gmx.de>
Date: 2019-05-03 (Fri, 03 May 2019)
Origin message was:
------------------
- mipsel: fix merge
This commit is contained in:
@@ -57,14 +57,7 @@ static bool usb_icon = false;
|
||||
static bool timer_icon = false;
|
||||
#endif
|
||||
|
||||
#if HAVE_ARM_HARDWARE
|
||||
#define DISPLAY_DEV "/dev/dbox/oled0"
|
||||
#include <zapit/zapit.h>
|
||||
static bool usb_icon = false;
|
||||
static bool timer_icon = false;
|
||||
#endif
|
||||
|
||||
#if HAVE_MIPS_HARDWARE
|
||||
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
|
||||
#define DISPLAY_DEV "/dev/dbox/oled0"
|
||||
#include <zapit/zapit.h>
|
||||
static bool usb_icon = false;
|
||||
|
Reference in New Issue
Block a user