diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-14 20:12:25 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-14 20:12:25 +0100 |
commit | a9042defa29a01cc538b742eab047848e9b5ae14 (patch) | |
tree | 8990e86b37831ef58dfb0c7dd3459a51a435af01 /kernel | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik... (diff) | |
parent | NTB: correct ntb_spad_count comment typo (diff) | |
download | linux-a9042defa29a01cc538b742eab047848e9b5ae14.tar.xz linux-a9042defa29a01cc538b742eab047848e9b5ae14.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial updates from Jiri Kosina.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
NTB: correct ntb_spad_count comment typo
misc: ibmasm: fix typo in error message
Remove references to dead make variable LINUX_INCLUDE
Remove last traces of ikconfig.h
treewide: Fix printk() message errors
Documentation/device-mapper: s/getsize/getsz/
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index eb26e12c6c2a..eaee9de224bd 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -115,8 +115,6 @@ obj-$(CONFIG_HAS_IOMEM) += memremap.o $(obj)/configs.o: $(obj)/config_data.h -# config_data.h contains the same information as ikconfig.h but gzipped. -# Info from config_data can be extracted from /proc/config* targets += config_data.gz $(obj)/config_data.gz: $(KCONFIG_CONFIG) FORCE $(call if_changed,gzip) |