Merge pull request #317 from rm-hull/rpi-3.9.y

popcornmix · popcornmix · commit 7889cd6eedb2 · 2013-06-24T05:03:37.000-07:00
Build failure caused by missing EXPORT_SYMBOL_GPL(bcm_dma_wait_idle); in dma.c
diff --git a/arch/arm/mach-bcm2708/dma.c b/arch/arm/mach-bcm2708/dma.c
@@ -71,6 +71,8 @@ bcm_dma_start(void __iomem *dma_chan_base, dma_addr_t control_block)
 	writel(control_block,	     dma_chan_base + BCM2708_DMA_ADDR);
 	writel(BCM2708_DMA_ACTIVE,   dma_chan_base + BCM2708_DMA_CS);
 }
+EXPORT_SYMBOL_GPL(bcm_dma_start);
+
 
 extern void bcm_dma_wait_idle(void __iomem *dma_chan_base)
 {
@@ -80,8 +82,7 @@ extern void bcm_dma_wait_idle(void __iomem *dma_chan_base)
   while (readl(dma_chan_base + BCM2708_DMA_CS) & BCM2708_DMA_ACTIVE)
     cpu_relax();
 }
-
-EXPORT_SYMBOL_GPL(bcm_dma_start);
+EXPORT_SYMBOL_GPL(bcm_dma_wait_idle);
 
 /* Complete an ongoing DMA (assuming its results are to be ignored)
    Does nothing if there is no DMA in progress.

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,8 @@ bcm_dma_start(void __iomem *dma_chan_base, dma_addr_t control_block)`
`71`	`71`	`writel(control_block, dma_chan_base + BCM2708_DMA_ADDR);`
`72`	`72`	`writel(BCM2708_DMA_ACTIVE, dma_chan_base + BCM2708_DMA_CS);`
`73`	`73`	`}`
	`74`	`+EXPORT_SYMBOL_GPL(bcm_dma_start);`
	`75`	`+`
`74`	`76`
`75`	`77`	`extern void bcm_dma_wait_idle(void __iomem *dma_chan_base)`
`76`	`78`	`{`
`@@ -80,8 +82,7 @@ extern void bcm_dma_wait_idle(void __iomem *dma_chan_base)`
`80`	`82`	`while (readl(dma_chan_base + BCM2708_DMA_CS) & BCM2708_DMA_ACTIVE)`
`81`	`83`	`cpu_relax();`
`82`	`84`	`}`
`83`		`-`
`84`		`-EXPORT_SYMBOL_GPL(bcm_dma_start);`
	`85`	`+EXPORT_SYMBOL_GPL(bcm_dma_wait_idle);`
`85`	`86`
`86`	`87`	`/* Complete an ongoing DMA (assuming its results are to be ignored)`
`87`	`88`	`Does nothing if there is no DMA in progress.`