diff options
| author | Jon Loeliger <jdl@freescale.com> | 2007-08-13 11:01:52 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2007-08-13 11:01:52 -0500 |
| commit | 8e2dd87eee01bb1b83beab7caf22b851c5cafb2c (patch) | |
| tree | 47a43e05d90de7d64ed356bab5f15e8d89f5b5cc /libfdt/fdt_sw.c | |
| parent | cca34967cbd13ff6bd352be29e3f1cc88ab24c05 (diff) | |
| parent | 9986bc3e40e899bea372a99a2bca4071bdf2e24b (diff) | |
| download | u-boot-imx-8e2dd87eee01bb1b83beab7caf22b851c5cafb2c.zip u-boot-imx-8e2dd87eee01bb1b83beab7caf22b851c5cafb2c.tar.gz u-boot-imx-8e2dd87eee01bb1b83beab7caf22b851c5cafb2c.tar.bz2 | |
Merge commit 'remotes/wd/master'
Conflicts:
MAKEALL
With any luck, this is the last MAKEALL merge conflict!
Diffstat (limited to 'libfdt/fdt_sw.c')
| -rw-r--r-- | libfdt/fdt_sw.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libfdt/fdt_sw.c b/libfdt/fdt_sw.c index 672f4dd..c7eea8f 100644 --- a/libfdt/fdt_sw.c +++ b/libfdt/fdt_sw.c @@ -16,6 +16,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#if CONFIG_OF_LIBFDT + #include "libfdt_env.h" #include <fdt.h> @@ -224,3 +227,5 @@ int fdt_finish(void *fdt) fdt_set_header(fdt, magic, FDT_MAGIC); return 0; } + +#endif /* CONFIG_OF_LIBFDT */ |