Merge commit 'origin/master' into next

[linux-2.6-omap-h63xx.git] / include / mtd / Kbuild

diff --git a/include/mtd/Kbuild b/include/mtd/Kbuild
index 13e7a3c6d79476274c3eb993da753f94ba08b864..8eb018f96002d84f7ae3a0810023cffc65333f04 100644 (file)
--- a/include/mtd/Kbuild
+++ b/include/mtd/Kbuild
@@ -1,6 +1,6 @@
 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
-
-unifdef-y += mtd-abi.h
+header-y += ubi-user.h