ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 04:33:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tbsdtv_linux_media/master' into tbsdtv_linux_media/latest

Browse Source 
Conflicts:
	drivers/media/dvb-core/dvb_ca_en50221.c
	drivers/media/usb/cx231xx/Kconfig
	drivers/media/usb/cx231xx/cx231xx-cards.c
	drivers/media/usb/cx231xx/cx231xx-dvb.c
	drivers/media/usb/cx231xx/cx231xx.h
This commit is contained in:
CrazyCat
2017-07-12 03:25:36 +03:00
parent 31df469c9e 2748e76ddb
commit 597f4b6034
12594 changed files with 1352893 additions and 290008 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/Makefile
View File

@@ -176,7 +176,8 @@ quiet_cmd_fwbin = MK_FW $@
wordsize_deps := $(wildcard include/config/64bit.h include/config/32bit.h \
include/config/ppc32.h include/config/ppc64.h \
include/config/superh32.h include/config/superh64.h \
include/config/x86_32.h include/config/x86_64.h)
include/config/x86_32.h include/config/x86_64.h \
firmware/Makefile)
$(patsubst %,$(obj)/%.gen.S, $(fw-shipped-y)): %: $(wordsize_deps)
$(call cmd,fwbin,$(patsubst %.gen.S,%,$@))