diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 17:32:24 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 17:32:24 -0400 |
| commit | a348a7e6fdbcd2d5192a09719a479bb238fde727 (patch) | |
| tree | 5ff94185f4e5a810777469d7fe7832a8ec2d3430 /drivers/dma/Makefile | |
| parent | 808347f6a31792079e345ec865e9cfcb6e8ae6b2 (diff) | |
| parent | 28d0325ce6e0a52f53d8af687e6427fee59004d3 (diff) | |
Merge commit 'v2.6.31-rc1' into dmaengine
Diffstat (limited to 'drivers/dma/Makefile')
| -rw-r--r-- | drivers/dma/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile index d7bc5fd17d84..40e1e0083571 100644 --- a/drivers/dma/Makefile +++ b/drivers/dma/Makefile | |||
| @@ -9,3 +9,4 @@ obj-$(CONFIG_MV_XOR) += mv_xor.o | |||
| 9 | obj-$(CONFIG_DW_DMAC) += dw_dmac.o | 9 | obj-$(CONFIG_DW_DMAC) += dw_dmac.o |
| 10 | obj-$(CONFIG_AT_HDMAC) += at_hdmac.o | 10 | obj-$(CONFIG_AT_HDMAC) += at_hdmac.o |
| 11 | obj-$(CONFIG_MX3_IPU) += ipu/ | 11 | obj-$(CONFIG_MX3_IPU) += ipu/ |
| 12 | obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o | ||