aboutsummaryrefslogtreecommitdiffstats
path: root/include/mtd
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-09-22 12:56:22 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-22 12:56:22 -0700
commite6e5fee1426bef07f4e6c3c76f48343c14207938 (patch)
tree28f4ca26cf85e0971e9bb4927c439b36c2b93f51 /include/mtd
parent3e59ddff2b8dfe42b15520c4f8f2486bd9f9708e (diff)
parentfadcfa33b6319a5faf8af2287f08bf93a7f926b6 (diff)
downloadmrst-s0i3-test-e6e5fee1426bef07f4e6c3c76f48343c14207938.tar.gz
mrst-s0i3-test-e6e5fee1426bef07f4e6c3c76f48343c14207938.tar.xz
mrst-s0i3-test-e6e5fee1426bef07f4e6c3c76f48343c14207938.zip
Merge git://git.infradead.org/~dwmw2/hdroneline
* git://git.infradead.org/~dwmw2/hdroneline: [HEADERS] One line per header in Kbuild files to reduce conflicts Manual (trivial) conflict resolution in include/asm-s390/Kbuild
Diffstat (limited to 'include/mtd')
-rw-r--r--include/mtd/Kbuild8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/mtd/Kbuild b/include/mtd/Kbuild
index e1da2a5b2a5..13e7a3c6d79 100644
--- a/include/mtd/Kbuild
+++ b/include/mtd/Kbuild
@@ -1,2 +1,6 @@
-unifdef-y := mtd-abi.h
-header-y := inftl-user.h jffs2-user.h mtd-user.h nftl-user.h
+header-y += inftl-user.h
+header-y += jffs2-user.h
+header-y += mtd-user.h
+header-y += nftl-user.h
+
+unifdef-y += mtd-abi.h