lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge git://git.infradead.org/~dwmw2/random-2.6

Browse Source 
* git://git.infradead.org/~dwmw2/random-2.6:
  remove dummy asm/kvm.h files
  firmware: create firmware binaries during 'make modules'.
This commit is contained in:
Linus Torvalds
2008-07-25 12:01:37 -07:00
parent c6af5e9f8a 7dcf2a9fce
commit 762b8291be
24 changed files with 11 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/Makefile.fwinst
View File

@@ -17,14 +17,15 @@ include $(srctree)/$(obj)/Makefile
include scripts/Makefile.host
mod-fw := $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-m))
mod-fw := $(fw-shipped-m)
# If CONFIG_FIRMWARE_IN_KERNEL isn't set, then install the
# firmware for in-kernel drivers too.
ifndef CONFIG_FIRMWARE_IN_KERNEL
mod-fw += $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-y))
mod-fw += $(fw-shipped-y)
endif
installed-mod-fw := $(addprefix $(INSTALL_FW_PATH)/,$(mod-fw))
installed-fw := $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-all))
installed-fw-dirs := $(sort $(dir $(installed-fw))) $(INSTALL_FW_PATH)/.
@@ -49,7 +50,8 @@ PHONY += __fw_install __fw_modinst FORCE
.PHONY: $(PHONY)
__fw_install: $(installed-fw)
__fw_modinst: $(mod-fw)
__fw_modinst: $(installed-mod-fw)
__fw_modbuild: $(addprefix $(obj)/,$(mod-fw))
FORCE: