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/boards/panda/board.c | |
| parent | 0e7c77a3fdfa0504c31594dd800e460820a5fff1 (diff) | |
| parent | 502ecda2d17ed4b50b6c4d5afb04832013996173 (diff) | |
| download | barebox-597da1b76ebd0083f929e59801f72a6dd6aef5cd.tar.gz barebox-597da1b76ebd0083f929e59801f72a6dd6aef5cd.tar.xz | |
Merge branch 'next'
Diffstat (limited to 'arch/arm/boards/panda/board.c')
| -rw-r--r-- | arch/arm/boards/panda/board.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boards/panda/board.c b/arch/arm/boards/panda/board.c index 33ec144db4..6a149aaeaa 100644 --- a/arch/arm/boards/panda/board.c +++ b/arch/arm/boards/panda/board.c @@ -3,7 +3,7 @@ #include <init.h> #include <fs.h> #include <driver.h> -#include <asm/io.h> +#include <io.h> #include <ns16550.h> #include <asm/armlinux.h> #include <linux/stat.h> |