Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 762b8291 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.infradead.org/~dwmw2/random-2.6:
  remove dummy asm/kvm.h files
  firmware: create firmware binaries during 'make modules'.
parents c6af5e9f 7dcf2a9f

Makefile

+1 −0
Original line number Diff line number Diff line
@@ -1061,6 +1061,7 @@ modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) 
	$(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order

	@echo '  Building modules, stage 2.';

	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost

	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild





# Target to prepare building external modules

include/asm-alpha/kvm.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#ifndef __LINUX_KVM_ALPHA_H

#define __LINUX_KVM_ALPHA_H



/* alpha does not support KVM */



#endif

include/asm-arm/kvm.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#ifndef __LINUX_KVM_ARM_H

#define __LINUX_KVM_ARM_H



/* arm does not support KVM */



#endif

include/asm-avr32/kvm.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#ifndef __LINUX_KVM_AVR32_H

#define __LINUX_KVM_AVR32_H



/* avr32 does not support KVM */



#endif

include/asm-blackfin/kvm.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#ifndef __LINUX_KVM_BLACKFIN_H

#define __LINUX_KVM_BLACKFIN_H



/* blackfin does not support KVM */



#endif