diff options
| author | Ben Dooks <ben@simtec.co.uk> | 2009-03-19 11:02:33 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-05-01 06:39:06 -0400 |
| commit | 5a9eb8da8b95fce21eb2dd39fe71b2b7882ce89a (patch) | |
| tree | c5be753f5ef4f63c1b117c321c03af7974f109b7 | |
| parent | 091438dd5668396328a3419abcbc6591159eb8d1 (diff) | |
[ARM] S3C24XX: Move plat/dma.h
Move the platform dma.h to dma-plat.h to ensure it doen't get
confused with plat/dma.h
Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| -rw-r--r-- | arch/arm/mach-s3c2410/dma.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2412/dma.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2440/dma.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2443/dma.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-s3c24xx/dma.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-s3c24xx/include/plat/dma-plat.h (renamed from arch/arm/plat-s3c24xx/include/plat/dma.h) | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-s3c2410/dma.c b/arch/arm/mach-s3c2410/dma.c index 440c014e24b3..6248f412f678 100644 --- a/arch/arm/mach-s3c2410/dma.c +++ b/arch/arm/mach-s3c2410/dma.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | #include <mach/dma.h> | 20 | #include <mach/dma.h> |
| 21 | 21 | ||
| 22 | #include <plat/cpu.h> | 22 | #include <plat/cpu.h> |
| 23 | #include <plat/dma.h> | 23 | #include <plat/dma-plat.h> |
| 24 | 24 | ||
| 25 | #include <plat/regs-serial.h> | 25 | #include <plat/regs-serial.h> |
| 26 | #include <mach/regs-gpio.h> | 26 | #include <mach/regs-gpio.h> |
diff --git a/arch/arm/mach-s3c2412/dma.c b/arch/arm/mach-s3c2412/dma.c index 9e3478506c6f..f888d4e01b0f 100644 --- a/arch/arm/mach-s3c2412/dma.c +++ b/arch/arm/mach-s3c2412/dma.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | 20 | ||
| 21 | #include <mach/dma.h> | 21 | #include <mach/dma.h> |
| 22 | 22 | ||
| 23 | #include <plat/dma.h> | 23 | #include <plat/dma-plat.h> |
| 24 | #include <plat/cpu.h> | 24 | #include <plat/cpu.h> |
| 25 | 25 | ||
| 26 | #include <plat/regs-serial.h> | 26 | #include <plat/regs-serial.h> |
diff --git a/arch/arm/mach-s3c2440/dma.c b/arch/arm/mach-s3c2440/dma.c index 69b6cf34df47..895783fe8b5f 100644 --- a/arch/arm/mach-s3c2440/dma.c +++ b/arch/arm/mach-s3c2440/dma.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | 19 | ||
| 20 | #include <mach/dma.h> | 20 | #include <mach/dma.h> |
| 21 | 21 | ||
| 22 | #include <plat/dma.h> | 22 | #include <plat/dma-plat.h> |
| 23 | #include <plat/cpu.h> | 23 | #include <plat/cpu.h> |
| 24 | 24 | ||
| 25 | #include <plat/regs-serial.h> | 25 | #include <plat/regs-serial.h> |
diff --git a/arch/arm/mach-s3c2443/dma.c b/arch/arm/mach-s3c2443/dma.c index 8430e5829186..825b718a63af 100644 --- a/arch/arm/mach-s3c2443/dma.c +++ b/arch/arm/mach-s3c2443/dma.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | 20 | ||
| 21 | #include <mach/dma.h> | 21 | #include <mach/dma.h> |
| 22 | 22 | ||
| 23 | #include <plat/dma.h> | 23 | #include <plat/dma-plat.h> |
| 24 | #include <plat/cpu.h> | 24 | #include <plat/cpu.h> |
| 25 | 25 | ||
| 26 | #include <plat/regs-serial.h> | 26 | #include <plat/regs-serial.h> |
diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c index aee2aeb46c60..d3d1375d95b3 100644 --- a/arch/arm/plat-s3c24xx/dma.c +++ b/arch/arm/plat-s3c24xx/dma.c | |||
| @@ -34,7 +34,7 @@ | |||
| 34 | 34 | ||
| 35 | #include <mach/map.h> | 35 | #include <mach/map.h> |
| 36 | 36 | ||
| 37 | #include <plat/dma.h> | 37 | #include <plat/dma-plat.h> |
| 38 | 38 | ||
| 39 | /* io map for dma */ | 39 | /* io map for dma */ |
| 40 | static void __iomem *dma_base; | 40 | static void __iomem *dma_base; |
diff --git a/arch/arm/plat-s3c24xx/include/plat/dma.h b/arch/arm/plat-s3c24xx/include/plat/dma-plat.h index c78efe316fc8..fbe84afe2d90 100644 --- a/arch/arm/plat-s3c24xx/include/plat/dma.h +++ b/arch/arm/plat-s3c24xx/include/plat/dma-plat.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* linux/include/asm-arm/plat-s3c24xx/dma.h | 1 | /* linux/arch/arm/plat-s3c24xx/include/plat/dma-plat.h |
| 2 | * | 2 | * |
| 3 | * Copyright (C) 2006 Simtec Electronics | 3 | * Copyright (C) 2006 Simtec Electronics |
| 4 | * Ben Dooks <ben@simtec.co.uk> | 4 | * Ben Dooks <ben@simtec.co.uk> |