Merge 'drm-3264' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/airlied...

[linux-2.6] / include / asm-ppc64 / ppc32.h

diff --git a/include/asm-ppc64/ppc32.h b/include/asm-ppc64/ppc32.h
index 1d0404897550ba5d8ac72919c5e3370bf4935e9d..6b44a8caf39564db93bce628b5eee68f859182cf 100644 (file)
--- a/include/asm-ppc64/ppc32.h
+++ b/include/asm-ppc64/ppc32.h
@@ -32,7 +32,7 @@ typedef struct compat_siginfo {
 
                /* POSIX.1b timers */
                struct {
-                       timer_t _tid;                   /* timer id */
+                       compat_timer_t _tid;                    /* timer id */
                        int _overrun;                   /* overrun count */
                        compat_sigval_t _sigval;                /* same as below */
                        int _sys_private;               /* not to be passed to user */