[IA64] Define paddr_t.

Temporary build workaround

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

diff --git a/include/asm-ia64/maddr.h b/include/asm-ia64/maddr.h
index be7242267a46ce32916b27b672e7f46d85ef3431..c22202154f95288035343c4a2268cf3e5ad563b0 100644 (file)
--- a/include/asm-ia64/maddr.h
+++ b/include/asm-ia64/maddr.h
@@ -103,5 +103,8 @@ mfn_to_local_pfn(unsigned long mfn)
 #define set_phys_to_machine(pfn, mfn) do { } while (0)
 
 typedef unsigned long maddr_t; // to compile netback, netfront
+#ifndef _ASM_IA64_SN_TYPES_H /* paddr_t is defined in asm-ia64/sn/types.h */
+typedef unsigned long paddr_t;
+#endif
 
 #endif /* _ASM_IA64_MADDR_H */

diff --git a/include/asm-ia64/sn/types.h b/include/asm-ia64/sn/types.h
index 8e04ee211e59d5f7081ed7082a681b7838e51d4a..20f13bfb38fd9ce32652ed9e408c5da99adbed32 100644 (file)
--- a/include/asm-ia64/sn/types.h
+++ b/include/asm-ia64/sn/types.h
@@ -20,7 +20,9 @@ typedef unsigned char slotid_t;       /* slot (blade) within module */
 typedef unsigned char  slabid_t;       /* slab (asic) within slot */
 typedef u64 nic_t;
 typedef unsigned long iopaddr_t;
+#ifndef _ASM_IA64_MADDR_H /* paddr_t is defined in asm-ia64/maddr.h */
 typedef unsigned long paddr_t;
+#endif
 typedef short cnodeid_t;
 
 #endif /* _ASM_IA64_SN_TYPES_H */