From: Daniel Hellstrom <daniel@gaisler.com>
Date: Wed, 9 Jul 2008 12:34:11 +0000 (+0000)
Subject: SPARC: Build error fix
X-Git-Tag: v1.3.4-rc1~60
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=21ae6ca0315afdbc65dc3e95ffd5763e6773d030;p=oweals%2Fu-boot.git

SPARC: Build error fix

(introduced by commit 391fd93ab23e15ab3dd58a54f5b609024009c378)

This patch makes SPARC targets build again. It is caused by
phys_addr_t and phys_size_t being defined in the wrong header
file. include/lmb.h need those typedefs to build.

Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
---

diff --git a/include/asm-sparc/io.h b/include/asm-sparc/io.h
index 2a27d06798..ede0b1a8db 100644
--- a/include/asm-sparc/io.h
+++ b/include/asm-sparc/io.h
@@ -70,7 +70,6 @@
  * that can be used to access the memory range with the caching
  * properties specified by "flags".
  */
-typedef unsigned long phys_addr_t;
 
 #define MAP_NOCACHE	(0)
 #define MAP_WRCOMBINE	(0)
diff --git a/include/asm-sparc/types.h b/include/asm-sparc/types.h
index 69f93d60b8..2cf974a7a9 100644
--- a/include/asm-sparc/types.h
+++ b/include/asm-sparc/types.h
@@ -65,6 +65,9 @@ typedef unsigned long long u64;
 /* DMA addresses are 32-bits wide */
 typedef u32 dma_addr_t;
 
+typedef unsigned long phys_addr_t;
+typedef unsigned long phys_size_t;
+
 #endif				/* __KERNEL__ */
 #endif				/* __ASSEMBLY__ */