diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-10-09 03:58:49 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-10-09 03:58:49 +0200 |
| commit | 597da1b76ebd0083f929e59801f72a6dd6aef5cd (patch) | |
| tree | 533372bf174baae1b81bccae1b6ba300a518d642 /arch/arm/mach-nomadik | |
| parent | 0e7c77a3fdfa0504c31594dd800e460820a5fff1 (diff) | |
| parent | 502ecda2d17ed4b50b6c4d5afb04832013996173 (diff) | |
| download | barebox-597da1b76ebd0083f929e59801f72a6dd6aef5cd.tar.gz barebox-597da1b76ebd0083f929e59801f72a6dd6aef5cd.tar.xz | |
Merge branch 'next'
Diffstat (limited to 'arch/arm/mach-nomadik')
| -rw-r--r-- | arch/arm/mach-nomadik/reset.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-nomadik/timer.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-nomadik/reset.c b/arch/arm/mach-nomadik/reset.c index d55f278293..6ea74dd6c0 100644 --- a/arch/arm/mach-nomadik/reset.c +++ b/arch/arm/mach-nomadik/reset.c @@ -18,7 +18,7 @@ */ #include <common.h> -#include <asm/io.h> +#include <io.h> #include <mach/hardware.h> void __noreturn reset_cpu(unsigned long addr) diff --git a/arch/arm/mach-nomadik/timer.c b/arch/arm/mach-nomadik/timer.c index 7de1f391a6..becd36357a 100644 --- a/arch/arm/mach-nomadik/timer.c +++ b/arch/arm/mach-nomadik/timer.c @@ -11,7 +11,7 @@ #include <common.h> #include <init.h> #include <clock.h> -#include <asm/io.h> +#include <io.h> #include <mach/hardware.h> #include <mach/mtu.h> #include <mach/timex.h> |