tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] ppc32: fix ppc4xx stb03xxx dma build

Fixes build on 4xx stb03xxx when general purpose dma engine support is
enabled.

Signed-off-by: Matt Porter <mporter@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Matt Porter and committed by Linus Torvalds 28cd1d17 2eaa297c

+8 -4
unified split
+7 -3
arch/ppc/syslib/ppc4xx_dma.c
··· 620 620 return DMA_STATUS_GOOD; 621 621 } 622 622 623 + #ifdef CONFIG_PPC4xx_EDMA 623 624 /* 624 625 * Enables the burst on the channel (BTEN bit in the control/count register) 625 626 * Note: ··· 686 685 return DMA_STATUS_GOOD; 687 686 } 688 687 688 + EXPORT_SYMBOL(ppc4xx_enable_burst); 689 + EXPORT_SYMBOL(ppc4xx_disable_burst); 690 + EXPORT_SYMBOL(ppc4xx_set_burst_size); 691 + #endif /* CONFIG_PPC4xx_EDMA */ 692 + 689 693 EXPORT_SYMBOL(ppc4xx_init_dma_channel); 690 694 EXPORT_SYMBOL(ppc4xx_get_channel_config); 691 695 EXPORT_SYMBOL(ppc4xx_set_channel_priority); ··· 709 703 EXPORT_SYMBOL(ppc4xx_disable_dma_interrupt); 710 704 EXPORT_SYMBOL(ppc4xx_get_dma_status); 711 705 EXPORT_SYMBOL(ppc4xx_clr_dma_status); 712 - EXPORT_SYMBOL(ppc4xx_enable_burst); 713 - EXPORT_SYMBOL(ppc4xx_disable_burst); 714 - EXPORT_SYMBOL(ppc4xx_set_burst_size); 706 +
+1 -1
include/asm-ppc/ppc4xx_dma.h
··· 285 285 286 286 #define GET_DMA_POLARITY(chan) (DMAReq_ActiveLow(chan) | DMAAck_ActiveLow(chan) | EOT_ActiveLow(chan)) 287 287 288 - #elif defined(CONFIG_STBXXX_DMA) /* stb03xxx */ 288 + #elif defined(CONFIG_STB03xxx) /* stb03xxx */ 289 289 290 290 #define DMA_PPC4xx_SIZE 4096 291 291