diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 21:17:05 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 21:17:05 -0400 |
| commit | c45aa055c32b488fc3fd73c760df372b09acf69a (patch) | |
| tree | 03bd52a8b843b48185c6b9831c25b5dbf5ac0382 /drivers/mtd/nand/Makefile | |
| parent | 784f4d5e66ac1d962091e08fe5a4b238ed8c793d (diff) | |
| parent | 8dd851de8184bb39c4ea86de20a0ed2496e6eb0d (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/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile index 27c9f0a1ef83..7cebc10c474e 100644 --- a/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | obj-$(CONFIG_MTD_NAND) += nand.o nand_ecc.o | 6 | obj-$(CONFIG_MTD_NAND) += nand.o nand_ecc.o |
| 7 | obj-$(CONFIG_MTD_NAND_IDS) += nand_ids.o | 7 | obj-$(CONFIG_MTD_NAND_IDS) += nand_ids.o |
| 8 | 8 | ||
| 9 | obj-$(CONFIG_MTD_NAND_CAFE) += cafe_nand.o | ||
| 9 | obj-$(CONFIG_MTD_NAND_SPIA) += spia.o | 10 | obj-$(CONFIG_MTD_NAND_SPIA) += spia.o |
| 10 | obj-$(CONFIG_MTD_NAND_AMS_DELTA) += ams-delta.o | 11 | obj-$(CONFIG_MTD_NAND_AMS_DELTA) += ams-delta.o |
| 11 | obj-$(CONFIG_MTD_NAND_TOTO) += toto.o | 12 | obj-$(CONFIG_MTD_NAND_TOTO) += toto.o |