summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c24xx/dma-s3c2412.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-23 19:25:29 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-23 19:25:29 +0100
commit5561f17f2629cdacf5bc43e0f839ca6434db2c20 (patch)
treec0e1acfcc969c81d5d072ee3b512a934d99a7ec2 /arch/arm/mach-s3c24xx/dma-s3c2412.c
parent423a5e0fd46de6bd92c52b2ef136856929eeb649 (diff)
parentd486fea6babfe3ff0c382c9e4baf18f535fcee7d (diff)
downloadlinux-5561f17f2629cdacf5bc43e0f839ca6434db2c20.tar.bz2
Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next
Diffstat (limited to 'arch/arm/mach-s3c24xx/dma-s3c2412.c')
-rw-r--r--arch/arm/mach-s3c24xx/dma-s3c2412.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c24xx/dma-s3c2412.c b/arch/arm/mach-s3c24xx/dma-s3c2412.c
index d2408ba372cb..6eaa7a4991f8 100644
--- a/arch/arm/mach-s3c24xx/dma-s3c2412.c
+++ b/arch/arm/mach-s3c24xx/dma-s3c2412.c
@@ -25,11 +25,9 @@
#include <plat/regs-serial.h>
#include <mach/regs-gpio.h>
-#include <plat/regs-ac97.h>
#include <plat/regs-dma.h>
#include <mach/regs-lcd.h>
#include <mach/regs-sdi.h>
-#include <plat/regs-iis.h>
#include <plat/regs-spi.h>
#define MAP(x) { (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID }