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

Commit 5d7cb157 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/cleanup 

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/cleanup:
  defconfig reduction
  kbuild: drop unifdef-y support
  archs: replace unifdef-y with header-y
  include: replace unifdef-y with header-y
parents fc58fb18 8b1bb907

Documentation/kbuild/makefiles.txt

+0 −6
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ This document describes the Linux kernel Makefiles. 
		--- 7.1 header-y

		--- 7.2 objhdr-y

		--- 7.3 destination-y

		--- 7.4 unifdef-y (deprecated)



	=== 8 Kbuild Variables

	=== 9 Makefile language
@@ -1245,11 +1244,6 @@ See subsequent chapter for the syntax of the Kbuild file. 
	will be located in the directory "include/linux" when exported.





	--- 7.4 unifdef-y (deprecated)



	unifdef-y is deprecated. A direct replacement is header-y.





=== 8 Kbuild Variables



The top Makefile exports the following variables:

arch/alpha/defconfig

+17 −867

File changed.

Preview size limit exceeded, changes collapsed.

arch/alpha/include/asm/Kbuild

+5 −6
Original line number Diff line number Diff line 
include include/asm-generic/Kbuild.asm



header-y += compiler.h

header-y += console.h

header-y += fpu.h

header-y += gentrap.h

header-y += regdef.h

header-y += pal.h

header-y += reg.h



unifdef-y += console.h

unifdef-y += fpu.h

unifdef-y += sysinfo.h

unifdef-y += compiler.h
 
header-y += regdef.h

header-y += sysinfo.h

arch/arm/include/asm/Kbuild

+1 −1
Original line number Diff line number Diff line 
include include/asm-generic/Kbuild.asm



unifdef-y += hwcap.h
 
header-y += hwcap.h

arch/avr32/configs/atngw100_defconfig

+0 −1249

File changed.

Preview size limit exceeded, changes collapsed.