Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-6.0

This commit is contained in:
Stephan Raue 2015-07-04 10:04:54 +02:00
commit 435495a9c9
2 changed files with 2 additions and 2 deletions

View File

@ -1381,7 +1381,7 @@ CONFIG_HW_RANDOM_BCM2708=m
CONFIG_BRCM_CHAR_DRIVERS=y
CONFIG_BCM_VC_CMA=y
CONFIG_BCM2708_VCMEM=y
# CONFIG_BCM_VC_SM is not set
CONFIG_BCM_VC_SM=y
# CONFIG_XILLYBUS is not set
#

View File

@ -1433,7 +1433,7 @@ CONFIG_HW_RANDOM_BCM2708=m
CONFIG_BRCM_CHAR_DRIVERS=y
CONFIG_BCM_VC_CMA=y
CONFIG_BCM2708_VCMEM=y
# CONFIG_BCM_VC_SM is not set
CONFIG_BCM_VC_SM=y
# CONFIG_XILLYBUS is not set
#