diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-08-12 06:28:00 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-08-12 06:28:00 -0400 |
| commit | 742c52533b05d8ae83c794bd6811100675b85ce5 (patch) | |
| tree | de89a81d88c19504d1dc4f023a4b480c9022b3b5 /drivers/mtd/nand/Makefile | |
| parent | 36cd4fb5d277f34fe9e4db0deac2d4efd7dff735 (diff) | |
| parent | 10fec20ef5eec1c91913baec1225400f0d02df40 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-arm/arch-omap/onenand.h
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 b55e4c69fea6..8540c46ffba9 100644 --- a/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile | |||
| @@ -26,6 +26,7 @@ obj-$(CONFIG_MTD_NAND_ATMEL) += atmel_nand.o | |||
| 26 | obj-$(CONFIG_MTD_NAND_CM_X270) += cmx270_nand.o | 26 | obj-$(CONFIG_MTD_NAND_CM_X270) += cmx270_nand.o |
| 27 | obj-$(CONFIG_MTD_NAND_BASLER_EXCITE) += excite_nandflash.o | 27 | obj-$(CONFIG_MTD_NAND_BASLER_EXCITE) += excite_nandflash.o |
| 28 | obj-$(CONFIG_MTD_NAND_PXA3xx) += pxa3xx_nand.o | 28 | obj-$(CONFIG_MTD_NAND_PXA3xx) += pxa3xx_nand.o |
| 29 | obj-$(CONFIG_MTD_NAND_TMIO) += tmio_nand.o | ||
| 29 | obj-$(CONFIG_MTD_NAND_PLATFORM) += plat_nand.o | 30 | obj-$(CONFIG_MTD_NAND_PLATFORM) += plat_nand.o |
| 30 | obj-$(CONFIG_MTD_ALAUDA) += alauda.o | 31 | obj-$(CONFIG_MTD_ALAUDA) += alauda.o |
| 31 | obj-$(CONFIG_MTD_NAND_PASEMI) += pasemi_nand.o | 32 | obj-$(CONFIG_MTD_NAND_PASEMI) += pasemi_nand.o |