diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /drivers/mtd/maps/Makefile | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
Diffstat (limited to 'drivers/mtd/maps/Makefile')
| -rw-r--r-- | drivers/mtd/maps/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile index 2dbc1bec8488..8bae7f9850c0 100644 --- a/drivers/mtd/maps/Makefile +++ b/drivers/mtd/maps/Makefile | |||
| @@ -25,7 +25,6 @@ obj-$(CONFIG_MTD_OCTAGON) += octagon-5066.o | |||
| 25 | obj-$(CONFIG_MTD_PHYSMAP) += physmap.o | 25 | obj-$(CONFIG_MTD_PHYSMAP) += physmap.o |
| 26 | obj-$(CONFIG_MTD_PHYSMAP_OF) += physmap_of.o | 26 | obj-$(CONFIG_MTD_PHYSMAP_OF) += physmap_of.o |
| 27 | obj-$(CONFIG_MTD_PMC_MSP_EVM) += pmcmsp-flash.o | 27 | obj-$(CONFIG_MTD_PMC_MSP_EVM) += pmcmsp-flash.o |
| 28 | obj-$(CONFIG_MTD_PMC_MSP_RAMROOT)+= pmcmsp-ramroot.o | ||
| 29 | obj-$(CONFIG_MTD_PCMCIA) += pcmciamtd.o | 28 | obj-$(CONFIG_MTD_PCMCIA) += pcmciamtd.o |
| 30 | obj-$(CONFIG_MTD_RPXLITE) += rpxlite.o | 29 | obj-$(CONFIG_MTD_RPXLITE) += rpxlite.o |
| 31 | obj-$(CONFIG_MTD_TQM8XXL) += tqm8xxl.o | 30 | obj-$(CONFIG_MTD_TQM8XXL) += tqm8xxl.o |