summaryrefslogtreecommitdiffstats
path: root/drivers/mci/mxs.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-10-09 03:58:49 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2011-10-09 03:58:49 +0200
commit597da1b76ebd0083f929e59801f72a6dd6aef5cd (patch)
tree533372bf174baae1b81bccae1b6ba300a518d642 /drivers/mci/mxs.c
parent0e7c77a3fdfa0504c31594dd800e460820a5fff1 (diff)
parent502ecda2d17ed4b50b6c4d5afb04832013996173 (diff)
downloadbarebox-597da1b76ebd0083f929e59801f72a6dd6aef5cd.tar.gz
barebox-597da1b76ebd0083f929e59801f72a6dd6aef5cd.tar.xz
Merge branch 'next'
Diffstat (limited to 'drivers/mci/mxs.c')
-rw-r--r--drivers/mci/mxs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mci/mxs.c b/drivers/mci/mxs.c
index eda9250885..4b8bd75b34 100644
--- a/drivers/mci/mxs.c
+++ b/drivers/mci/mxs.c
@@ -39,7 +39,7 @@
#include <mci.h>
#include <errno.h>
#include <clock.h>
-#include <asm/io.h>
+#include <io.h>
#include <asm/bitops.h>
#include <mach/imx-regs.h>
#include <mach/mci.h>