diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-28 07:56:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-28 07:56:05 -0700 |
| commit | 970b06485ffee36aa3549dfe4c6b2a2c2118354d (patch) | |
| tree | 1b0f6f4182e73d19071addf8a209e5fb58483d08 /drivers/mtd/Makefile | |
| parent | 696e65c3606aa3f587eeb181766baf49ea750cfc (diff) | |
| parent | 33f60e9640b2f60dde6735293d4aa5ecc5b1d5d5 (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
coda: move backing-dev.h kernel include inside __KERNEL__
mtd: ensure that bdi entries are properly initialized and registered
Move mtd_bdi_*mappable to mtdcore.c
btrfs: convert to using bdi_setup_and_register()
Catch filesystems lacking s_bdi
drbd: Terminate a connection early if sending the protocol fails
drbd: fix memory leak
Fix JFFS2 sync silent failure
smbfs: add bdi backing to mount session
ncpfs: add bdi backing to mount session
exofs: add bdi backing to mount session
ecryptfs: add bdi backing to mount session
coda: add bdi backing to mount session
cifs: add bdi backing to mount session
afs: add bdi backing to mount session.
9p: add bdi backing to mount session
bdi: add helper function for doing init and register of a bdi for a file system
block: ensure jiffies wrap is handled correctly in blk_rq_timed_out_timer
Diffstat (limited to 'drivers/mtd/Makefile')
| -rw-r--r-- | drivers/mtd/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile index 82d1e4de475..4521b1ecce4 100644 --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile @@ -4,7 +4,7 @@ # Core functionality. obj-$(CONFIG_MTD) += mtd.o -mtd-y := mtdcore.o mtdsuper.o mtdbdi.o +mtd-y := mtdcore.o mtdsuper.o mtd-$(CONFIG_MTD_PARTITIONS) += mtdpart.o obj-$(CONFIG_MTD_CONCAT) += mtdconcat.o |