# HG changeset patch
# User yamahata@xxxxxxxxxxxxx
# Date 1181619157 -32400
# Node ID 7b1613144f47a003521a982349ca9fde85922516
# Parent  245902ee7ce0c1499c172b3a9240b8e2ede45a5f
define paddr_t.
PATCHNAME: define_paddr_t

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>

diff -r 245902ee7ce0 -r 7b1613144f47 include/asm-ia64/maddr.h
--- a/include/asm-ia64/maddr.h	Mon Jun 11 14:59:53 2007 -0600
+++ b/include/asm-ia64/maddr.h	Tue Jun 12 12:32:37 2007 +0900
@@ -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 -r 245902ee7ce0 -r 7b1613144f47 include/asm-ia64/sn/types.h
--- a/include/asm-ia64/sn/types.h	Mon Jun 11 14:59:53 2007 -0600
+++ b/include/asm-ia64/sn/types.h	Tue Jun 12 12:32:37 2007 +0900
@@ -20,7 +20,9 @@ typedef unsigned char	slabid_t;	/* slab 
 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 */