diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-04-04 14:20:32 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-04-04 14:20:32 +0200 |
| commit | 45b87922a60e200aba668cc76f78ff2ff01ea382 (patch) | |
| tree | f95c9cb858b5c811d8288e129f3eb4aa610256ba /common | |
| parent | 8f2c6a3d2b513e64f680e7e9a70d1e068b71110a (diff) | |
| parent | 4271263e0d81cbb1e51a9a56e206844355ae7b7d (diff) | |
| download | barebox-45b87922a60e200aba668cc76f78ff2ff01ea382.tar.gz barebox-45b87922a60e200aba668cc76f78ff2ff01ea382.tar.xz | |
Merge branch 'for-next/misc-arm'
Diffstat (limited to 'common')
| -rw-r--r-- | common/kallsyms.c | 2 | ||||
| -rw-r--r-- | common/meminfo.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/common/kallsyms.c b/common/kallsyms.c index 0218991c46..94dfcdce84 100644 --- a/common/kallsyms.c +++ b/common/kallsyms.c @@ -1,7 +1,7 @@ #include <common.h> #include <init.h> #include <kallsyms.h> -#include <asm-generic/sections.h> +#include <asm/sections.h> #ifndef DOXYGEN_SHOULD_SKIP_THIS diff --git a/common/meminfo.c b/common/meminfo.c index 5e3ff716a5..ad9bbd98ed 100644 --- a/common/meminfo.c +++ b/common/meminfo.c @@ -2,7 +2,7 @@ #include <init.h> #include <memory.h> #include <asm-generic/memory_layout.h> -#include <asm-generic/sections.h> +#include <asm/sections.h> static int display_meminfo(void) { |