Merge branch 'linux-2.6' into for-2.6.22

[sfrench/cifs-2.6.git] / drivers / mtd / Makefile

diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index c130e6261adfe6a02c1eab2409963f61900d5e03..92055405cb3041cc699deb734637e9fffc6bdd30 100644 (file)
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -28,3 +28,5 @@ nftl-objs             := nftlcore.o nftlmount.o
 inftl-objs             := inftlcore.o inftlmount.o
 
 obj-y          += chips/ maps/ devices/ nand/ onenand/
+
+obj-$(CONFIG_MTD_UBI)          += ubi/