diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-06 08:23:24 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-06 08:23:24 +0100 |
| commit | e9ea6eeaabb15258dbeefe06a421fca8c2fe9baa (patch) | |
| tree | 075fbf70c17a50190c3fb290eb6b362177f0d1e5 /arch/arm/cpu | |
| parent | 18aa86831ed72380b7c2edba3c27bbf7a999da76 (diff) | |
| parent | 1e7f2bd25c28b36c7c40ed4797b2a21cc4e1502e (diff) | |
| download | barebox-e9ea6eeaabb15258dbeefe06a421fca8c2fe9baa.tar.gz barebox-e9ea6eeaabb15258dbeefe06a421fca8c2fe9baa.tar.xz | |
Merge branch 'for-next/misc'
Conflicts:
scripts/Makefile
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/start.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c index 21c63c0cc5..399e6b8330 100644 --- a/arch/arm/cpu/start.c +++ b/arch/arm/cpu/start.c @@ -20,6 +20,7 @@ #include <common.h> #include <init.h> #include <sizes.h> +#include <of.h> #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> #include <asm-generic/memory_layout.h> |