mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 08:51:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/driver/fb_accel_cs_hd1.cpp
	src/driver/fb_accel_cs_hd2.cpp


Origin commit data
------------------
Commit: 1e5b102802
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)
This commit is contained in:
vanhofen
2017-02-08 20:38:28 +01:00
parent 53a4a8dd85 534d1b315e
commit f7b4d9e941
6 changed files with 119 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/driver/fb_generic.cpp
View File

@@ -124,10 +124,11 @@ CFrameBuffer* CFrameBuffer::getInstance()
frameBuffer = new CFbAccelSTi();
#endif
#if HAVE_COOL_HARDWARE
#ifdef BOXMODEL_NEVIS
frameBuffer = new CFbAccelCSHD1();
#endif
#ifdef BOXMODEL_APOLLO
frameBuffer = new CFbAccelCSApollo();
#else
frameBuffer = new CFbAccelCSNevis();
frameBuffer = new CFbAccelCSHD2();
#endif
#endif
#if HAVE_GENERIC_HARDWARE