diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-29 13:48:07 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-29 13:49:55 -0500 |
| commit | f40b121d983dfc53bde882aadec7f2f0bbcbd1c2 (patch) | |
| tree | ef7e99f154d2f9aa5109abdcb331342cad27fe22 | |
| parent | dcea83adc666061864b82c96e059dffe7268b512 (diff) | |
[ARM] Rename ISA mach/dma.h header to mach/isa-dma.h
This avoids confusion with platform specific DMA implementations in
mach/dma.h
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/include/asm/dma.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-footbridge/include/mach/isa-dma.h (renamed from arch/arm/mach-footbridge/include/mach/dma.h) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-h720x/include/mach/isa-dma.h (renamed from arch/arm/mach-h720x/include/mach/dma.h) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-rpc/include/mach/isa-dma.h (renamed from arch/arm/mach-rpc/include/mach/dma.h) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-shark/include/mach/isa-dma.h (renamed from arch/arm/mach-shark/include/mach/dma.h) | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/include/asm/dma.h b/arch/arm/include/asm/dma.h index 06419980dde7..df5638f3643a 100644 --- a/arch/arm/include/asm/dma.h +++ b/arch/arm/include/asm/dma.h | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | 21 | ||
| 22 | typedef unsigned int dmach_t; | 22 | typedef unsigned int dmach_t; |
| 23 | 23 | ||
| 24 | #include <mach/dma.h> | 24 | #include <mach/isa-dma.h> |
| 25 | 25 | ||
| 26 | /* | 26 | /* |
| 27 | * DMA modes | 27 | * DMA modes |
diff --git a/arch/arm/mach-footbridge/include/mach/dma.h b/arch/arm/mach-footbridge/include/mach/isa-dma.h index 62afd213effb..5bd4a0d338a8 100644 --- a/arch/arm/mach-footbridge/include/mach/dma.h +++ b/arch/arm/mach-footbridge/include/mach/isa-dma.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * arch/arm/mach-footbridge/include/mach/dma.h | 2 | * arch/arm/mach-footbridge/include/mach/isa-dma.h |
| 3 | * | 3 | * |
| 4 | * Architecture DMA routines | 4 | * Architecture DMA routines |
| 5 | * | 5 | * |
diff --git a/arch/arm/mach-h720x/include/mach/dma.h b/arch/arm/mach-h720x/include/mach/isa-dma.h index 2d7c77a9792a..3eafb3f163c0 100644 --- a/arch/arm/mach-h720x/include/mach/dma.h +++ b/arch/arm/mach-h720x/include/mach/isa-dma.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * arch/arm/mach-h720x/include/mach/dma.h | 2 | * arch/arm/mach-h720x/include/mach/isa-dma.h |
| 3 | * | 3 | * |
| 4 | * Architecture DMA routes | 4 | * Architecture DMA routes |
| 5 | * | 5 | * |
diff --git a/arch/arm/mach-rpc/include/mach/dma.h b/arch/arm/mach-rpc/include/mach/isa-dma.h index f0f8c9fb26bf..bad720548587 100644 --- a/arch/arm/mach-rpc/include/mach/dma.h +++ b/arch/arm/mach-rpc/include/mach/isa-dma.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * arch/arm/mach-rpc/include/mach/dma.h | 2 | * arch/arm/mach-rpc/include/mach/isa-dma.h |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1997 Russell King | 4 | * Copyright (C) 1997 Russell King |
| 5 | * | 5 | * |
diff --git a/arch/arm/mach-shark/include/mach/dma.h b/arch/arm/mach-shark/include/mach/isa-dma.h index dfe1da0e5aca..864298ff3927 100644 --- a/arch/arm/mach-shark/include/mach/dma.h +++ b/arch/arm/mach-shark/include/mach/isa-dma.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * arch/arm/mach-shark/include/mach/dma.h | 2 | * arch/arm/mach-shark/include/mach/isa-dma.h |
| 3 | * | 3 | * |
| 4 | * by Alexander Schulz | 4 | * by Alexander Schulz |
| 5 | */ | 5 | */ |