diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-04 20:54:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-04 20:54:09 -0400 |
| commit | ec4883b015c3212f6f6d04fb2ff45f528492f598 (patch) | |
| tree | 0e393eb198a35a90adafcd8129564d0173aafad4 /drivers/mtd/Makefile | |
| parent | 464cf177df7727efcc5506322fc5d0c8b896f545 (diff) | |
| parent | 0477d24e2a87a9077b62298b01b031929f5cf2a2 (diff) | |
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 @@ | |||
| 1 | # | 1 | # |
| 2 | # Makefile for the memory technology device drivers. | 2 | # Makefile for the memory technology device drivers. |
| 3 | # | 3 | # |
| 4 | # $Id: Makefile.common,v 1.7 2005/07/11 10:39:27 gleixner Exp $ | ||
| 5 | 4 | ||
| 6 | # Core functionality. | 5 | # Core functionality. |
| 7 | mtd-y := mtdcore.o | 6 | mtd-y := mtdcore.o mtdsuper.o |
| 8 | mtd-$(CONFIG_MTD_PARTITIONS) += mtdpart.o | 7 | mtd-$(CONFIG_MTD_PARTITIONS) += mtdpart.o |
| 9 | obj-$(CONFIG_MTD) += $(mtd-y) | 8 | obj-$(CONFIG_MTD) += $(mtd-y) |
| 10 | 9 | ||