Merge branch 'master' into pu/fb-modules

Origin commit data
------------------
Branch: ni/coolstream
Commit: 0cb26e6e98
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2017-02-12 09:24:08 +01:00
32 changed files with 112 additions and 99 deletions

View File

@@ -241,7 +241,7 @@ if test -e ${srcdir}/lib/libcoolstream/nevis_ir.h; then
fi
HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream -I$(top_srcdir)/src/zapit/include/private'
if test "$BOXMODEL" = "apollo"; then
if test "$BOXMODEL" = "hd2"; then
if test -e ${srcdir}/lib/libcoolstream2/cs_ir_generic.h; then
AC_DEFINE(HAVE_COOLSTREAM_CS_IR_GENERIC_H,1,[Define to 1 if you have the <cs_ir_generic.h> header file.])
fi