aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/spi/spi-s3c64xx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 4ab992bfea83..6d6537d09d4f 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -34,7 +34,7 @@
34 34
35#include <linux/platform_data/spi-s3c64xx.h> 35#include <linux/platform_data/spi-s3c64xx.h>
36 36
37#ifdef CONFIG_SAMSUNG_DMADEV 37#ifdef CONFIG_S3C_DMA
38#include <mach/dma.h> 38#include <mach/dma.h>
39#endif 39#endif
40 40
@@ -199,7 +199,7 @@ struct s3c64xx_spi_driver_data {
199 unsigned cur_speed; 199 unsigned cur_speed;
200 struct s3c64xx_spi_dma_data rx_dma; 200 struct s3c64xx_spi_dma_data rx_dma;
201 struct s3c64xx_spi_dma_data tx_dma; 201 struct s3c64xx_spi_dma_data tx_dma;
202#ifdef CONFIG_SAMSUNG_DMADEV 202#ifdef CONFIG_S3C_DMA
203 struct samsung_dma_ops *ops; 203 struct samsung_dma_ops *ops;
204#endif 204#endif
205 struct s3c64xx_spi_port_config *port_conf; 205 struct s3c64xx_spi_port_config *port_conf;
@@ -283,7 +283,7 @@ static void s3c64xx_spi_dmacb(void *data)
283 spin_unlock_irqrestore(&sdd->lock, flags); 283 spin_unlock_irqrestore(&sdd->lock, flags);
284} 284}
285 285
286#ifdef CONFIG_SAMSUNG_DMADEV 286#ifdef CONFIG_S3C_DMA
287/* FIXME: remove this section once arch/arm/mach-s3c64xx uses dmaengine */ 287/* FIXME: remove this section once arch/arm/mach-s3c64xx uses dmaengine */
288 288
289static struct s3c2410_dma_client s3c64xx_spi_dma_client = { 289static struct s3c2410_dma_client s3c64xx_spi_dma_client = {