diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-04-13 17:29:07 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-13 17:29:07 -0400 |
| commit | f499cae1e59d75d5eb24c23d47cf8986e6032c6d (patch) | |
| tree | 1af6235c18391212c40116eb90b01eae8938efee /drivers/mtd/maps/Makefile | |
| parent | fc3f55e672e1ed917dd9e215af81939cd3d717da (diff) | |
| parent | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/mtd/maps/Makefile')
| -rw-r--r-- | drivers/mtd/maps/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile index 26b28a7a90b5..2dbc1bec8488 100644 --- a/drivers/mtd/maps/Makefile +++ b/drivers/mtd/maps/Makefile | |||
| @@ -56,9 +56,9 @@ obj-$(CONFIG_MTD_IXP4XX) += ixp4xx.o | |||
| 56 | obj-$(CONFIG_MTD_IXP2000) += ixp2000.o | 56 | obj-$(CONFIG_MTD_IXP2000) += ixp2000.o |
| 57 | obj-$(CONFIG_MTD_WRSBC8260) += wr_sbc82xx_flash.o | 57 | obj-$(CONFIG_MTD_WRSBC8260) += wr_sbc82xx_flash.o |
| 58 | obj-$(CONFIG_MTD_DMV182) += dmv182.o | 58 | obj-$(CONFIG_MTD_DMV182) += dmv182.o |
| 59 | obj-$(CONFIG_MTD_SHARP_SL) += sharpsl-flash.o | ||
| 60 | obj-$(CONFIG_MTD_PLATRAM) += plat-ram.o | 59 | obj-$(CONFIG_MTD_PLATRAM) += plat-ram.o |
| 61 | obj-$(CONFIG_MTD_OMAP_NOR) += omap_nor.o | 60 | obj-$(CONFIG_MTD_OMAP_NOR) += omap_nor.o |
| 62 | obj-$(CONFIG_MTD_INTEL_VR_NOR) += intel_vr_nor.o | 61 | obj-$(CONFIG_MTD_INTEL_VR_NOR) += intel_vr_nor.o |
| 63 | obj-$(CONFIG_MTD_BFIN_ASYNC) += bfin-async-flash.o | 62 | obj-$(CONFIG_MTD_BFIN_ASYNC) += bfin-async-flash.o |
| 63 | obj-$(CONFIG_MTD_RBTX4939) += rbtx4939-flash.o | ||
| 64 | obj-$(CONFIG_MTD_VMU) += vmu-flash.o | 64 | obj-$(CONFIG_MTD_VMU) += vmu-flash.o |