diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2008-07-28 19:09:44 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-07-28 19:09:44 -0400 |
| commit | f15cbe6f1a4b4d9df59142fc8e4abb973302cf44 (patch) | |
| tree | 774d7b11abaaf33561ab8268bf51ddd9ceb79025 /arch/sh/drivers/dma | |
| parent | 25326277d8d1393d1c66240e6255aca780f9e3eb (diff) | |
sh: migrate to arch/sh/include/
This follows the sparc changes a439fe51a1f8eb087c22dd24d69cebae4a3addac.
Most of the moving about was done with Sam's directions at:
http://marc.info/?l=linux-sh&m=121724823706062&w=2
with subsequent hacking and fixups entirely my fault.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/drivers/dma')
| -rw-r--r-- | arch/sh/drivers/dma/dma-g2.c | 4 | ||||
| -rw-r--r-- | arch/sh/drivers/dma/dma-pvr2.c | 4 | ||||
| -rw-r--r-- | arch/sh/drivers/dma/dma-sh.c | 2 | ||||
| -rw-r--r-- | arch/sh/drivers/dma/dma-sh.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/arch/sh/drivers/dma/dma-g2.c b/arch/sh/drivers/dma/dma-g2.c index 0caf11bb7e27..af7bb589c2c8 100644 --- a/arch/sh/drivers/dma/dma-g2.c +++ b/arch/sh/drivers/dma/dma-g2.c | |||
| @@ -14,8 +14,8 @@ | |||
| 14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 15 | #include <linux/interrupt.h> | 15 | #include <linux/interrupt.h> |
| 16 | #include <asm/cacheflush.h> | 16 | #include <asm/cacheflush.h> |
| 17 | #include <asm/mach/sysasic.h> | 17 | #include <mach/sysasic.h> |
| 18 | #include <asm/mach/dma.h> | 18 | #include <mach/dma.h> |
| 19 | #include <asm/dma.h> | 19 | #include <asm/dma.h> |
| 20 | 20 | ||
| 21 | struct g2_channel { | 21 | struct g2_channel { |
diff --git a/arch/sh/drivers/dma/dma-pvr2.c b/arch/sh/drivers/dma/dma-pvr2.c index 838fad566eaf..391cbe1c2956 100644 --- a/arch/sh/drivers/dma/dma-pvr2.c +++ b/arch/sh/drivers/dma/dma-pvr2.c | |||
| @@ -13,8 +13,8 @@ | |||
| 13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 15 | #include <linux/interrupt.h> | 15 | #include <linux/interrupt.h> |
| 16 | #include <asm/mach/sysasic.h> | 16 | #include <mach/sysasic.h> |
| 17 | #include <asm/mach/dma.h> | 17 | #include <mach/dma.h> |
| 18 | #include <asm/dma.h> | 18 | #include <asm/dma.h> |
| 19 | #include <asm/io.h> | 19 | #include <asm/io.h> |
| 20 | 20 | ||
diff --git a/arch/sh/drivers/dma/dma-sh.c b/arch/sh/drivers/dma/dma-sh.c index 71ff3d6f26e2..bd305483c144 100644 --- a/arch/sh/drivers/dma/dma-sh.c +++ b/arch/sh/drivers/dma/dma-sh.c | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 15 | #include <linux/interrupt.h> | 15 | #include <linux/interrupt.h> |
| 16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 17 | #include <asm/dreamcast/dma.h> | 17 | #include <mach/dma.h> |
| 18 | #include <asm/dma.h> | 18 | #include <asm/dma.h> |
| 19 | #include <asm/io.h> | 19 | #include <asm/io.h> |
| 20 | #include "dma-sh.h" | 20 | #include "dma-sh.h" |
diff --git a/arch/sh/drivers/dma/dma-sh.h b/arch/sh/drivers/dma/dma-sh.h index 0f591fbc922d..b05af34fc15d 100644 --- a/arch/sh/drivers/dma/dma-sh.h +++ b/arch/sh/drivers/dma/dma-sh.h | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | #ifndef __DMA_SH_H | 11 | #ifndef __DMA_SH_H |
| 12 | #define __DMA_SH_H | 12 | #define __DMA_SH_H |
| 13 | 13 | ||
| 14 | #include <asm/cpu/dma.h> | 14 | #include <cpu/dma.h> |
| 15 | 15 | ||
| 16 | /* Definitions for the SuperH DMAC */ | 16 | /* Definitions for the SuperH DMAC */ |
| 17 | #define REQ_L 0x00000000 | 17 | #define REQ_L 0x00000000 |