diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-15 19:08:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-15 19:08:50 -0400 |
commit | 65a6ec0d72a07f16719e9b7a96e1c4bae044b591 (patch) | |
tree | 344e03a5039a44982c1b78d6113633b21b434820 /arch/arm/plat-omap/dma.c | |
parent | 541010e4b8921cd781ff02ae68028501457045b6 (diff) | |
parent | 0181b61a988424b5cc44fe09e6968142359c815e (diff) |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (95 commits)
[ARM] 4578/1: CM-x270: PCMCIA support
[ARM] 4577/1: ITE 8152 PCI bridge support
[ARM] 4576/1: CM-X270 machine support
[ARM] pxa: Avoid pxa_gpio_mode() in gpio_direction_{in,out}put()
[ARM] pxa: move pxa_set_mode() from pxa2xx_mainstone.c to mainstone.c
[ARM] pxa: move pxa_set_mode() from pxa2xx_lubbock.c to lubbock.c
[ARM] pxa: Make cpu_is_pxaXXX dependent on configuration symbols
[ARM] pxa: PXA3xx base support
[NET] smc91x: fix PXA DMA support code
[SERIAL] Fix console initialisation ordering
[ARM] pxa: tidy up arch/arm/mach-pxa/Makefile
[ARM] Update arch/arm/Kconfig for drivers/Kconfig changes
[ARM] 4600/1: fix kernel build failure with build-id-supporting binutils
[ARM] 4599/1: Preserve ATAG list for use with kexec (2.6.23)
[ARM] Rename consistent_sync() as dma_cache_maint()
[ARM] 4572/1: ep93xx: add cirrus logic edb9307 support
[ARM] 4596/1: S3C2412: Correct IRQs for SDI+CF and add decoding support
[ARM] 4595/1: ns9xxx: define registers as void __iomem * instead of volatile u32
[ARM] 4594/1: ns9xxx: use the new gpio functions
[ARM] 4593/1: ns9xxx: implement generic clockevents
...
Diffstat (limited to 'arch/arm/plat-omap/dma.c')
-rw-r--r-- | arch/arm/plat-omap/dma.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index 88d5b6d9f950..05a38498cbe0 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c | |||
@@ -1347,11 +1347,6 @@ void omap_stop_lcd_dma(void) | |||
1347 | omap_writew(w, OMAP1610_DMA_LCD_CTRL); | 1347 | omap_writew(w, OMAP1610_DMA_LCD_CTRL); |
1348 | } | 1348 | } |
1349 | 1349 | ||
1350 | int omap_lcd_dma_ext_running(void) | ||
1351 | { | ||
1352 | return lcd_dma.ext_ctrl && lcd_dma.active; | ||
1353 | } | ||
1354 | |||
1355 | /*----------------------------------------------------------------------------*/ | 1350 | /*----------------------------------------------------------------------------*/ |
1356 | 1351 | ||
1357 | static int __init omap_init_dma(void) | 1352 | static int __init omap_init_dma(void) |
@@ -1493,7 +1488,6 @@ EXPORT_SYMBOL(omap_free_lcd_dma); | |||
1493 | EXPORT_SYMBOL(omap_enable_lcd_dma); | 1488 | EXPORT_SYMBOL(omap_enable_lcd_dma); |
1494 | EXPORT_SYMBOL(omap_setup_lcd_dma); | 1489 | EXPORT_SYMBOL(omap_setup_lcd_dma); |
1495 | EXPORT_SYMBOL(omap_stop_lcd_dma); | 1490 | EXPORT_SYMBOL(omap_stop_lcd_dma); |
1496 | EXPORT_SYMBOL(omap_lcd_dma_ext_running); | ||
1497 | EXPORT_SYMBOL(omap_set_lcd_dma_b1); | 1491 | EXPORT_SYMBOL(omap_set_lcd_dma_b1); |
1498 | EXPORT_SYMBOL(omap_set_lcd_dma_single_transfer); | 1492 | EXPORT_SYMBOL(omap_set_lcd_dma_single_transfer); |
1499 | EXPORT_SYMBOL(omap_set_lcd_dma_ext_controller); | 1493 | EXPORT_SYMBOL(omap_set_lcd_dma_ext_controller); |