diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-08-05 23:15:37 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-04-21 15:00:45 +0200 |
| commit | 042c48848b7d8dab4f095bce2872c02f711bf5d0 (patch) | |
| tree | c681025a4d3fc77b3f750a9c91e5b7b4b976e1e9 /include | |
| parent | 6f9364746e5a43e5b602812c82a47830bb726268 (diff) | |
| download | linux-stable-042c48848b7d8dab4f095bce2872c02f711bf5d0.tar.gz linux-stable-042c48848b7d8dab4f095bce2872c02f711bf5d0.tar.bz2 linux-stable-042c48848b7d8dab4f095bce2872c02f711bf5d0.zip | |
ARM: omap1: move lcd_dma code into omapfb driver
The omapfb driver is split into platform specific code for omap1, and
driver code that is also specific to omap1.
Moving both parts into the driver directory simplifies the structure
and avoids the dependency on certain omap machine header files.
As mach/lcd_dma.h can not be included from include/linux/omap-dma.h
any more now, move the omap_lcd_dma_running() declaration into the
omap-dma header, which matches where it is defined.
Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/omap-dma.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/omap-dma.h b/include/linux/omap-dma.h index 5c5c93ad6b50..441f5f0919c6 100644 --- a/include/linux/omap-dma.h +++ b/include/linux/omap-dma.h @@ -328,8 +328,8 @@ extern dma_addr_t omap_get_dma_dst_pos(int lch); extern int omap_get_dma_active_status(int lch); extern int omap_dma_running(void); -#if defined(CONFIG_ARCH_OMAP1) && IS_ENABLED(CONFIG_FB_OMAP) -#include <mach/lcd_dma.h> +#if IS_ENABLED(CONFIG_FB_OMAP) +extern int omap_lcd_dma_running(void); #else static inline int omap_lcd_dma_running(void) { |