diff options
author | Tejun Heo <tj@kernel.org> | 2010-12-17 17:16:46 +0300 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2010-12-17 17:16:46 +0300 |
commit | 275c8b93288ef0c2281e414e069ea8ed4bad03f7 (patch) | |
tree | df906ef901d7719d66944921c7436f5db718dc2f /drivers/dma/ioat/Makefile | |
parent | 909ea96468096b07fbb41aaf69be060d92bd9271 (diff) | |
parent | 8f1d97c79eb65de1d05799d6b81d79cd94169114 (diff) | |
download | linux-275c8b93288ef0c2281e414e069ea8ed4bad03f7.tar.xz |
Merge branch 'this_cpu_ops' into for-2.6.38
Diffstat (limited to 'drivers/dma/ioat/Makefile')
-rw-r--r-- | drivers/dma/ioat/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/ioat/Makefile b/drivers/dma/ioat/Makefile index 8997d3fb9051..0ff7270af25b 100644 --- a/drivers/dma/ioat/Makefile +++ b/drivers/dma/ioat/Makefile @@ -1,2 +1,2 @@ obj-$(CONFIG_INTEL_IOATDMA) += ioatdma.o -ioatdma-objs := pci.o dma.o dma_v2.o dma_v3.o dca.o +ioatdma-y := pci.o dma.o dma_v2.o dma_v3.o dca.o |