diff options
| author | Albert ARIBAUD | 2014-02-20 13:16:05 +0100 |
|---|---|---|
| committer | Albert ARIBAUD | 2014-02-20 13:16:05 +0100 |
| commit | 3e11350255d9c5d4bd03c2a65769da84c05d3294 (patch) | |
| tree | 2ebc3d0fa0592479020d2d9dc7228b4d15ed2eaa /tools/fdt_ro.c | |
| parent | e7538fee991308c16f76f7eca2517089f2a30ff4 (diff) | |
| parent | 0a8e823ad0c5a602c93c2e8a54caf622ade6d3fb (diff) | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts:
Makefile
drivers/net/npe/Makefile
These two conflicts arise from commit 0b2d3f20
("ARM: NET: Remove the IXP NPE ethernet driver") and are
resolved by deleting the drivers/net/npe/Makefile file
and removing the CONFIG_IXP4XX_NPE line from Makefile.
Diffstat (limited to 'tools/fdt_ro.c')
| -rw-r--r-- | tools/fdt_ro.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/fdt_ro.c b/tools/fdt_ro.c new file mode 100644 index 00000000000..9005fe3ca3a --- /dev/null +++ b/tools/fdt_ro.c @@ -0,0 +1 @@ +#include "../lib/libfdt/fdt_ro.c" |