From: Robert P. J. Day <rpjday@crashcourse.ca>
Date: Tue, 29 Apr 2008 07:59:28 +0000 (-0700)
Subject: kbuild: remove duplicate, conflicting entry for oom.h
X-Git-Tag: v2.6.26-rc1~625
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a6924f93d0d511da5b34189563c5e31ffe5df2e;p=linux-2.6

kbuild: remove duplicate, conflicting entry for oom.h

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 <rpjday@crashcourse.ca>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index bda6f04791..0634e5a8d3 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -117,7 +117,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