diff options
author | Jarkko Nikula <jarkko.nikula@bitmer.com> | 2013-06-15 04:31:09 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2013-06-18 03:12:34 -0400 |
commit | e2081f96ba1be3aa22a44daec82af9b226a6d7d6 (patch) | |
tree | a524fa45d822ee33c2db9303510feeaae6aa5440 /arch/arm/mach-omap1 | |
parent | b6a85477d7abf6bdb299860a066b6c66a5c6a7dd (diff) |
ARM: OMAP1: Remove dma.h
Add definitions in arch/arm/mach-omap1/dma.h are now removed so remove
the file and include statements from dma.c and lcd_dma.c.
Signed-off-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1')
-rw-r--r-- | arch/arm/mach-omap1/dma.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap1/dma.h | 26 | ||||
-rw-r--r-- | arch/arm/mach-omap1/lcd_dma.c | 2 |
3 files changed, 0 insertions, 30 deletions
diff --git a/arch/arm/mach-omap1/dma.c b/arch/arm/mach-omap1/dma.c index a94b3a718d1a..5bb8ce86d54b 100644 --- a/arch/arm/mach-omap1/dma.c +++ b/arch/arm/mach-omap1/dma.c | |||
@@ -30,8 +30,6 @@ | |||
30 | 30 | ||
31 | #include <mach/irqs.h> | 31 | #include <mach/irqs.h> |
32 | 32 | ||
33 | #include "dma.h" | ||
34 | |||
35 | #define OMAP1_DMA_BASE (0xfffed800) | 33 | #define OMAP1_DMA_BASE (0xfffed800) |
36 | #define OMAP1_LOGICAL_DMA_CH_COUNT 17 | 34 | #define OMAP1_LOGICAL_DMA_CH_COUNT 17 |
37 | #define OMAP1_DMA_STRIDE 0x40 | 35 | #define OMAP1_DMA_STRIDE 0x40 |
diff --git a/arch/arm/mach-omap1/dma.h b/arch/arm/mach-omap1/dma.h deleted file mode 100644 index 6c751e8266da..000000000000 --- a/arch/arm/mach-omap1/dma.h +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | /* | ||
2 | * OMAP1 DMA channel definitions | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License as published by | ||
6 | * the Free Software Foundation; either version 2 of the License, or | ||
7 | * (at your option) any later version. | ||
8 | * | ||
9 | * This program is distributed in the hope that it will be useful, | ||
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | * GNU General Public License for more details. | ||
13 | * | ||
14 | * You should have received a copy of the GNU General Public License | ||
15 | * along with this program; if not, write to the Free Software | ||
16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
17 | */ | ||
18 | |||
19 | #ifndef __OMAP1_DMA_CHANNEL_H | ||
20 | #define __OMAP1_DMA_CHANNEL_H | ||
21 | |||
22 | /* DMA channels for omap1 */ | ||
23 | |||
24 | /* These are only for 1610 */ | ||
25 | |||
26 | #endif /* __OMAP1_DMA_CHANNEL_H */ | ||
diff --git a/arch/arm/mach-omap1/lcd_dma.c b/arch/arm/mach-omap1/lcd_dma.c index 77924be37d41..26a2b01c7c4f 100644 --- a/arch/arm/mach-omap1/lcd_dma.c +++ b/arch/arm/mach-omap1/lcd_dma.c | |||
@@ -32,8 +32,6 @@ | |||
32 | #include <mach/hardware.h> | 32 | #include <mach/hardware.h> |
33 | #include <mach/lcdc.h> | 33 | #include <mach/lcdc.h> |
34 | 34 | ||
35 | #include "dma.h" | ||
36 | |||
37 | int omap_lcd_dma_running(void) | 35 | int omap_lcd_dma_running(void) |
38 | { | 36 | { |
39 | /* | 37 | /* |