projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 's3c-move' into devel
[linux-2.6-block.git]
/
arch
/
arm
/
plat-s3c24xx
/
dma.c
diff --git
a/arch/arm/plat-s3c24xx/dma.c
b/arch/arm/plat-s3c24xx/dma.c
index 390ff9f478bfe4ca74bbd3ffa3a7763f9fa0461a..1baf941d1930b76e94b58b23464e5d71da00ab8d 100644
(file)
--- a/
arch/arm/plat-s3c24xx/dma.c
+++ b/
arch/arm/plat-s3c24xx/dma.c
@@
-26,11
+26,11
@@
#include <linux/slab.h>
#include <linux/errno.h>
#include <linux/delay.h>
+#include <linux/io.h>
#include <asm/system.h>
#include <asm/irq.h>
#include <mach/hardware.h>
-#include <asm/io.h>
#include <asm/dma.h>
#include <asm/mach/dma.h>