diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-04 17:54:09 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-04 17:54:09 -0700 |
commit | ec4883b015c3212f6f6d04fb2ff45f528492f598 (patch) | |
tree | 0e393eb198a35a90adafcd8129564d0173aafad4 /drivers/mtd/Makefile | |
parent | libata: always use polling SETXFER (diff) | |
parent | [JFFS2] Fix obsoletion of metadata nodes in jffs2_add_tn_to_tree() (diff) | |
download | linux-dev-ec4883b015c3212f6f6d04fb2ff45f528492f598.tar.xz linux-dev-ec4883b015c3212f6f6d04fb2ff45f528492f598.zip |
Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6:
[JFFS2] Fix obsoletion of metadata nodes in jffs2_add_tn_to_tree()
[MTD] Fix error checking after get_mtd_device() in get_sb_mtd functions
[JFFS2] Fix buffer length calculations in jffs2_get_inode_nodes()
[JFFS2] Fix potential memory leak of dead xattrs on unmount.
[JFFS2] Fix BUG() caused by failing to discard xattrs on deleted files.
[MTD] generalise the handling of MTD-specific superblocks
[MTD] [MAPS] don't force uclinux mtd map to be root dev
Diffstat (limited to 'drivers/mtd/Makefile')
-rw-r--r-- | drivers/mtd/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile index 92055405cb30..451adcc52b3c 100644 --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile @@ -1,10 +1,9 @@ # # Makefile for the memory technology device drivers. # -# $Id: Makefile.common,v 1.7 2005/07/11 10:39:27 gleixner Exp $ # Core functionality. -mtd-y := mtdcore.o +mtd-y := mtdcore.o mtdsuper.o mtd-$(CONFIG_MTD_PARTITIONS) += mtdpart.o obj-$(CONFIG_MTD) += $(mtd-y) |