aboutsummaryrefslogtreecommitdiffstats
path: root/include/mtd/Kbuild
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-10-01 17:55:53 +0100
committerDavid Woodhouse <dwmw2@infradead.org>2006-10-01 17:55:53 +0100
commit8a84fc15ae5cafcc366dd85cf8e1ab2040679abc (patch)
tree5d8dce194c9667fa92e9ec9f545cec867a9a1e0d /include/mtd/Kbuild
parent[MTD ONENAND] Check OneNAND lock scheme & all block unlock command support (diff)
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart (diff)
downloadlinux-dev-8a84fc15ae5cafcc366dd85cf8e1ab2040679abc.tar.xz
linux-dev-8a84fc15ae5cafcc366dd85cf8e1ab2040679abc.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Manually resolve conflict in include/mtd/Kbuild Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/mtd/Kbuild')
-rw-r--r--include/mtd/Kbuild6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/mtd/Kbuild b/include/mtd/Kbuild
index f2f210fc1ef2..e0fe92b03a4e 100644
--- a/include/mtd/Kbuild
+++ b/include/mtd/Kbuild
@@ -1 +1,5 @@
-header-y := inftl-user.h jffs2-user.h mtd-abi.h mtd-user.h nftl-user.h
+header-y += inftl-user.h
+header-y += jffs2-user.h
+header-y += mtd-abi.h
+header-y += mtd-user.h
+header-y += nftl-user.h