It used to be necessary for the phys_addr_t typedef, but now it doesn't make sense in a few places. Signed-off-by: Andrew Jones <drjones@xxxxxxxxxx> --- lib/arm/asm/setup.h | 1 - lib/arm/mmu.c | 1 - lib/arm64/asm/page.h | 2 -- lib/arm64/spinlock.c | 1 + 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/arm/asm/setup.h b/lib/arm/asm/setup.h index b0d51f5f0721..42bf9ba8c716 100644 --- a/lib/arm/asm/setup.h +++ b/lib/arm/asm/setup.h @@ -6,7 +6,6 @@ * This work is licensed under the terms of the GNU LGPL, version 2. */ #include <libcflat.h> -#include <alloc.h> /* phys_addr_t */ #include <asm/page.h> #include <asm/pgtable-hwdef.h> diff --git a/lib/arm/mmu.c b/lib/arm/mmu.c index 2e5c993f1e7f..9e420269f1c0 100644 --- a/lib/arm/mmu.c +++ b/lib/arm/mmu.c @@ -12,7 +12,6 @@ #include <asm/setup.h> #include <asm/page.h> -#include "alloc.h" #include "alloc_page.h" #include "vmalloc.h" #include <asm/pgtable-hwdef.h> diff --git a/lib/arm64/asm/page.h b/lib/arm64/asm/page.h index 01b4cf664aff..f06a6941971c 100644 --- a/lib/arm64/asm/page.h +++ b/lib/arm64/asm/page.h @@ -23,8 +23,6 @@ #define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE) -#include <alloc.h> - typedef u64 pteval_t; typedef u64 pmdval_t; typedef u64 pgdval_t; diff --git a/lib/arm64/spinlock.c b/lib/arm64/spinlock.c index a3907f03cacd..fac4fc9a7c20 100644 --- a/lib/arm64/spinlock.c +++ b/lib/arm64/spinlock.c @@ -5,6 +5,7 @@ * * This work is licensed under the terms of the GNU LGPL, version 2. */ +#include <libcflat.h> #include <asm/spinlock.h> #include <asm/barrier.h> #include <asm/mmu.h> -- 2.13.6