From: "Robert P. J. Day" oom.h is already tagged for unifdef'ing, so its entry as a simple exportable header should be deleted. Signed-off-by: Robert P. J. Day Cc: Sam Ravnborg Cc: David Woodhouse Signed-off-by: Andrew Morton --- include/linux/Kbuild | 1 - 1 file changed, 1 deletion(-) diff -puN include/linux/Kbuild~kbuild-remove-duplicate-conflicting-entry-for-oomh include/linux/Kbuild --- a/include/linux/Kbuild~kbuild-remove-duplicate-conflicting-entry-for-oomh +++ a/include/linux/Kbuild @@ -116,7 +116,6 @@ header-y += nfs2.h header-y += nfs4_mount.h header-y += nfs_mount.h header-y += nl80211.h -header-y += oom.h header-y += param.h header-y += pci_regs.h header-y += pfkeyv2.h _