diff options
| -rw-r--r-- | drivers/dma/Makefile | 3 | ||||
| -rw-r--r-- | drivers/dma/ioat/Makefile | 2 | ||||
| -rw-r--r-- | drivers/dma/ioat/dca.c (renamed from drivers/dma/ioat_dca.c) | 4 | ||||
| -rw-r--r-- | drivers/dma/ioat/dma.c (renamed from drivers/dma/ioat_dma.c) | 6 | ||||
| -rw-r--r-- | drivers/dma/ioat/dma.h (renamed from drivers/dma/ioatdma.h) | 2 | ||||
| -rw-r--r-- | drivers/dma/ioat/hw.h (renamed from drivers/dma/ioatdma_hw.h) | 0 | ||||
| -rw-r--r-- | drivers/dma/ioat/pci.c (renamed from drivers/dma/ioat.c) | 6 | ||||
| -rw-r--r-- | drivers/dma/ioat/registers.h (renamed from drivers/dma/ioatdma_registers.h) | 0 | ||||
| -rw-r--r-- | drivers/idle/i7300_idle.c | 4 |
9 files changed, 14 insertions, 13 deletions
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile index 2e5dc96700d2..a1cb2857bba6 100644 --- a/drivers/dma/Makefile +++ b/drivers/dma/Makefile @@ -1,8 +1,7 @@ obj-$(CONFIG_DMA_ENGINE) += dmaengine.o obj-$(CONFIG_NET_DMA) += iovlock.o obj-$(CONFIG_DMATEST) += dmatest.o -obj-$(CONFIG_INTEL_IOATDMA) += ioatdma.o -ioatdma-objs := ioat.o ioat_dma.o ioat_dca.o +obj-$(CONFIG_INTEL_IOATDMA) += ioat/ obj-$(CONFIG_INTEL_IOP_ADMA) += iop-adma.o obj-$(CONFIG_FSL_DMA) += fsldma.o obj-$(CONFIG_MV_XOR) += mv_xor.o diff --git a/drivers/dma/ioat/Makefile b/drivers/dma/ioat/Makefile new file mode 100644 index 000000000000..2ce3d3a4270b --- /dev/null +++ b/drivers/dma/ioat/Makefile @@ -0,0 +1,2 @@ +obj-$(CONFIG_INTEL_IOATDMA) += ioatdma.o +ioatdma-objs := pci.o dma.o dca.o diff --git a/drivers/dma/ioat_dca.c b/drivers/dma/ioat/dca.c index c012a1e15043..af1c762dd9d0 100644 --- a/drivers/dma/ioat_dca.c +++ b/drivers/dma/ioat/dca.c @@ -33,8 +33,8 @@ #define cpu_physical_id(cpu) (cpuid_ebx(1) >> 24) #endif -#include "ioatdma.h" -#include "ioatdma_registers.h" +#include "dma.h" +#include "registers.h" /* * Bit 7 of a tag map entry is the "valid" bit, if it is set then bits 0:6 diff --git a/drivers/dma/ioat_dma.c b/drivers/dma/ioat/dma.c index a600fc0f7962..648797e83295 100644 --- a/drivers/dma/ioat_dma.c +++ b/drivers/dma/ioat/dma.c @@ -34,9 +34,9 @@ #include <linux/dma-mapping.h> #include <linux/workqueue.h> #include <linux/i7300_idle.h> -#include "ioatdma.h" -#include "ioatdma_registers.h" -#include "ioatdma_hw.h" +#include "dma.h" +#include "registers.h" +#include "hw.h" #define to_ioat_chan(chan) container_of(chan, struct ioat_dma_chan, common) #define to_ioatdma_device(dev) container_of(dev, struct ioatdma_device, common) diff --git a/drivers/dma/ioatdma.h b/drivers/dma/ioat/dma.h index a52ff4bd4601..e80e787fe64f 100644 --- a/drivers/dma/ioatdma.h +++ b/drivers/dma/ioat/dma.h @@ -22,7 +22,7 @@ #define IOATDMA_H #include <linux/dmaengine.h> -#include "ioatdma_hw.h" +#include "hw.h" #include <linux/init.h> #include <linux/dmapool.h> #include <linux/cache.h> diff --git a/drivers/dma/ioatdma_hw.h b/drivers/dma/ioat/hw.h index afa57eef86c9..afa57eef86c9 100644 --- a/drivers/dma/ioatdma_hw.h +++ b/drivers/dma/ioat/hw.h diff --git a/drivers/dma/ioat.c b/drivers/dma/ioat/pci.c index 2225bb6ba3d1..d7948bfd8fba 100644 --- a/drivers/dma/ioat.c +++ b/drivers/dma/ioat/pci.c @@ -30,9 +30,9 @@ #include <linux/pci.h> #include <linux/interrupt.h> #include <linux/dca.h> -#include "ioatdma.h" -#include "ioatdma_registers.h" -#include "ioatdma_hw.h" +#include "dma.h" +#include "registers.h" +#include "hw.h" MODULE_VERSION(IOAT_DMA_VERSION); MODULE_LICENSE("GPL"); diff --git a/drivers/dma/ioatdma_registers.h b/drivers/dma/ioat/registers.h index 49bc277424f8..49bc277424f8 100644 --- a/drivers/dma/ioatdma_registers.h +++ b/drivers/dma/ioat/registers.h diff --git a/drivers/idle/i7300_idle.c b/drivers/idle/i7300_idle.c index 949c97ff57e3..f2ec7243549e 100644 --- a/drivers/idle/i7300_idle.c +++ b/drivers/idle/i7300_idle.c @@ -29,8 +29,8 @@ #include <asm/idle.h> -#include "../dma/ioatdma_hw.h" -#include "../dma/ioatdma_registers.h" +#include "../dma/ioat/hw.h" +#include "../dma/ioat/registers.h" #define I7300_IDLE_DRIVER_VERSION "1.55" #define I7300_PRINT "i7300_idle:" |