Merge branch 'dt' into next

1 files changed, 0 insertions, 12 deletions

diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 59213cfaeca9..bba87ca2b4d7 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -399,18 +399,6 @@ static unsigned long read_n_cells(int n, const unsigned int **buf)
         return result;
 }
 
-struct of_drconf_cell {
-        u64     base_addr;
-        u32     drc_index;
-        u32     reserved;
-        u32     aa_index;
-        u32     flags;
-};
-
-#define DRCONF_MEM_ASSIGNED     0x00000008
-#define DRCONF_MEM_AI_INVALID   0x00000040
-#define DRCONF_MEM_RESERVED     0x00000080
-
 /*
  * Read the next memblock list entry from the ibm,dynamic-memory property
  * and return the information in the provided of_drconf_cell structure.