Merge bk://kernel.bkbits.net/davem/sparc-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

include/asm-parisc/compat.h

@@ -112,7 +112,7 @@ typedef u32		compat_sigset_word;
  */
 typedef	u32		compat_uptr_t;
 
-static inline void *compat_ptr(compat_ptr_t uptr)
+static inline void *compat_ptr(compat_uptr_t uptr)
 {
 	return (void *)uptr;
 }

include/asm-ppc64/compat.h

@@ -106,7 +106,7 @@ typedef u32		compat_sigset_word;
  */
 typedef	u32		compat_uptr_t;
 
-static inline void *compat_ptr(compat_ptr_t uptr)
+static inline void *compat_ptr(compat_uptr_t uptr)
 {
 	return (void *)uptr;
 }

include/asm-s390x/compat.h

@@ -109,7 +109,7 @@ typedef u32		compat_sigset_word;
  */
 typedef	u32		compat_uptr_t;
 
-static inline void *compat_ptr(compat_ptr_t uptr)
+static inline void *compat_ptr(compat_uptr_t uptr)
 {
 	return (void *)(uptr & 0x7fffffffUL);
 }

include/asm-x86_64/compat.h

@@ -115,7 +115,7 @@ typedef u32               compat_sigset_word;
  */
 typedef	u32		compat_uptr_t;
 
-static inline void *compat_ptr(compat_ptr_t uptr)
+static inline void *compat_ptr(compat_uptr_t uptr)
 {
 	return (void *)uptr;
 }