aboutsummaryrefslogtreecommitdiff
path: root/drivers/mtd/nand/Makefile
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-10-22 02:17:05 +0100
committerDavid Woodhouse <dwmw2@infradead.org>2006-10-22 02:17:05 +0100
commitc45aa055c32b488fc3fd73c760df372b09acf69a (patch)
tree03bd52a8b843b48185c6b9831c25b5dbf5ac0382 /drivers/mtd/nand/Makefile
parent784f4d5e66ac1d962091e08fe5a4b238ed8c793d (diff)
parent8dd851de8184bb39c4ea86de20a0ed2496e6eb0d (diff)
Merge git://git.infradead.org/~dwmw2/cafe-2.6
Conflicts: drivers/mtd/nand/Kconfig
Diffstat (limited to 'drivers/mtd/nand/Makefile')
-rw-r--r--drivers/mtd/nand/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index 27c9f0a1ef8..7cebc10c474 100644
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -6,6 +6,7 @@
obj-$(CONFIG_MTD_NAND) += nand.o nand_ecc.o
obj-$(CONFIG_MTD_NAND_IDS) += nand_ids.o
+obj-$(CONFIG_MTD_NAND_CAFE) += cafe_nand.o
obj-$(CONFIG_MTD_NAND_SPIA) += spia.o
obj-$(CONFIG_MTD_NAND_AMS_DELTA) += ams-delta.o
obj-$(CONFIG_MTD_NAND_TOTO) += toto.o