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

1 files changed, 0 insertions, 6 deletions

diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
index c375313cb128..c787ae512120 100644
--- a/Documentation/kbuild/makefiles.txt
+++ b/Documentation/kbuild/makefiles.txt
@@ -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: