Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 6d05bd5d1f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-23 (Thu, 23 Feb 2017)
This commit is contained in:
vanhofen
2017-02-23 12:23:43 +01:00
4 changed files with 5 additions and 5 deletions

View File

@@ -222,7 +222,7 @@ int main (int argc, char **argv){
#if defined (EVENTDEV)
evd=open (EVENTDEV,O_RDWR);
if (evd<0){
perror ("opening event0 failed");
perror ("opening " EVENTDEV " failed");
return 1;
}
#else