diff options
| -rw-r--r-- | arch/nios2/cpu/fdt.c | 1 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc5xxx/cpu.c | 1 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc8260/cpu.c | 1 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc8xx/cpu.c | 1 | ||||
| -rw-r--r-- | arch/powerpc/cpu/ppc4xx/fdt.c | 1 | ||||
| -rw-r--r-- | arch/powerpc/lib/bootm.c | 1 | ||||
| -rw-r--r-- | arch/x86/include/asm/arch-coreboot/sysinfo.h | 3 | ||||
| -rw-r--r-- | board/cm5200/cm5200.c | 1 | ||||
| -rw-r--r-- | include/fdt_support.h | 3 |
9 files changed, 2 insertions, 11 deletions
diff --git a/arch/nios2/cpu/fdt.c b/arch/nios2/cpu/fdt.c index b1ed9e17f2..f238665915 100644 --- a/arch/nios2/cpu/fdt.c +++ b/arch/nios2/cpu/fdt.c @@ -30,7 +30,6 @@ #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) #include <libfdt.h> -#include <libfdt_env.h> #include <fdt_support.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/powerpc/cpu/mpc5xxx/cpu.c b/arch/powerpc/cpu/mpc5xxx/cpu.c index 0c1eebd4ee..dc021e35f5 100644 --- a/arch/powerpc/cpu/mpc5xxx/cpu.c +++ b/arch/powerpc/cpu/mpc5xxx/cpu.c @@ -36,7 +36,6 @@ #if defined(CONFIG_OF_LIBFDT) #include <libfdt.h> -#include <libfdt_env.h> #include <fdt_support.h> #endif diff --git a/arch/powerpc/cpu/mpc8260/cpu.c b/arch/powerpc/cpu/mpc8260/cpu.c index 220c1e24b1..f8bc5a9834 100644 --- a/arch/powerpc/cpu/mpc8260/cpu.c +++ b/arch/powerpc/cpu/mpc8260/cpu.c @@ -50,7 +50,6 @@ #if defined(CONFIG_OF_LIBFDT) #include <libfdt.h> -#include <libfdt_env.h> #include <fdt_support.h> #endif diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c index b3fcfe5626..b6b733d77f 100644 --- a/arch/powerpc/cpu/mpc8xx/cpu.c +++ b/arch/powerpc/cpu/mpc8xx/cpu.c @@ -45,7 +45,6 @@ #if defined(CONFIG_OF_LIBFDT) #include <libfdt.h> -#include <libfdt_env.h> #include <fdt_support.h> #endif diff --git a/arch/powerpc/cpu/ppc4xx/fdt.c b/arch/powerpc/cpu/ppc4xx/fdt.c index 37f5817f22..3cdd5319a9 100644 --- a/arch/powerpc/cpu/ppc4xx/fdt.c +++ b/arch/powerpc/cpu/ppc4xx/fdt.c @@ -29,7 +29,6 @@ #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) #include <libfdt.h> -#include <libfdt_env.h> #include <fdt_support.h> #include <asm/4xx_pcie.h> diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c index 33d013fcea..0119a7b6eb 100644 --- a/arch/powerpc/lib/bootm.c +++ b/arch/powerpc/lib/bootm.c @@ -38,7 +38,6 @@ #if defined(CONFIG_OF_LIBFDT) #include <libfdt.h> #include <fdt_support.h> - #endif #ifdef CONFIG_SYS_INIT_RAM_LOCK diff --git a/arch/x86/include/asm/arch-coreboot/sysinfo.h b/arch/x86/include/asm/arch-coreboot/sysinfo.h index bd88eb588f..78d3a9d49e 100644 --- a/arch/x86/include/asm/arch-coreboot/sysinfo.h +++ b/arch/x86/include/asm/arch-coreboot/sysinfo.h @@ -32,8 +32,7 @@ #include <common.h> #include <compiler.h> -#include <libfdt_env.h> -#include <fdt.h> +#include <libfdt.h> #include <asm/arch/tables.h> /* Allow a maximum of 16 memory range definitions. */ diff --git a/board/cm5200/cm5200.c b/board/cm5200/cm5200.c index b25887bcaa..c0ea1c6229 100644 --- a/board/cm5200/cm5200.c +++ b/board/cm5200/cm5200.c @@ -44,7 +44,6 @@ #ifdef CONFIG_OF_LIBFDT #include <libfdt.h> -#include <libfdt_env.h> #include <fdt_support.h> #endif /* CONFIG_OF_LIBFDT */ diff --git a/include/fdt_support.h b/include/fdt_support.h index 568bcbfaa7..2cccc3551d 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -26,8 +26,7 @@ #ifdef CONFIG_OF_LIBFDT -#include <libfdt_env.h> -#include <fdt.h> +#include <libfdt.h> u32 fdt_getprop_u32_default(const void *fdt, const char *path, const char *prop, const u32 dflt); |